[2/2] tests/kms_psr_sink_crc: Fix edp_psr debugfs interface run only on HAS_PSR.

Commit Message

Rodrigo Vivi Aug. 25, 2014, 5:58 p.m. UTC

Tests were broken on platforms that doesn't have psr or on new kernel that contains new interface.
A lot more need to be done to get these tests really useful, but for now lets avoid it breaking
tests framework.

Signed-off-by: Rodrigo Vivi <[e-mail]>
---
 tests/kms_psr_sink_crc.c | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

Patch

diff --git a/tests/kms_psr_sink_crc.c b/tests/kms_psr_sink_crc.c
index 909d6ca..312147e 100644
--- a/tests/kms_psr_sink_crc.c
+++ b/tests/kms_psr_sink_crc.c
@@ -37,6 +37,8 @@ 
 #include "igt_debugfs.h"
 #include "igt_kms.h"
 
+#define HAS_PSR(dev) (IS_HASWELL(dev) | IS_BROADWELL(dev))
+
 enum tests {
 	TEST_PAGE_FLIP,
 	TEST_MMAP_CPU,
@@ -259,7 +261,7 @@  static void fill_render(data_t *data, uint32_t handle,
 	gem_bo_busy(data->drm_fd, handle);
 }
 
-static bool psr_sink_support(data_t *data)
+static bool psr_enabled(data_t *data)
 {
 	int ret;
 	FILE *file;
@@ -269,14 +271,17 @@  static bool psr_sink_support(data_t *data)
 	igt_require(file);
 
 	ret = fscanf(file, "Sink_Support: %s\n", str);
-	igt_skip_on_f(ret == 0,
-		      "i915_edp_psr_status format not supported by this test case\n");
+	igt_assert(ret != 0);
+	ret = fscanf(file, "Source_OK: %s\n", str);
+	igt_assert(ret != 0);
+	ret = fscanf(file, "Enabled: %s\n", str);
+	igt_assert(ret != 0);
 
 	fclose(file);
 	return strcmp(str, "yes") == 0;
 }
 
-static bool psr_enabled(data_t *data)
+static bool psr_active(data_t *data)
 {
 	int ret;
 	FILE *file;
@@ -287,12 +292,18 @@  static bool psr_enabled(data_t *data)
 
 	ret = fscanf(file, "Sink_Support: %s\n", str);
 	igt_assert(ret != 0);
-
 	ret = fscanf(file, "Source_OK: %s\n", str);
 	igt_assert(ret != 0);
-
 	ret = fscanf(file, "Enabled: %s\n", str);
 	igt_assert(ret != 0);
+	ret = fscanf(file, "Active: %s\n", str);
+	igt_assert(ret != 0);
+	ret = fscanf(file, "Busy frontbuffer bits: %s\n", str);
+	igt_assert(ret != 0);
+	ret = fscanf(file, "Re-enable work scheduled: %s\n", str);
+	igt_assert(ret != 0);
+	ret = fscanf(file, "HW Enabled & Active bit: %s\n", str);
+	igt_assert(ret != 0);
 
 	fclose(file);
 	return strcmp(str, "yes") == 0;
@@ -301,7 +312,7 @@  static bool psr_enabled(data_t *data)
 static bool wait_psr_entry(data_t *data, int timeout)
 {
 	while (timeout--) {
-		if (psr_enabled(data))
+		if (psr_active(data))
 			return true;
 		sleep(1);
 	}
@@ -513,8 +524,6 @@  static void test_sprite(data_t *data)
 	igt_output_t *output;
 	drmModeModeInfo *mode;
 
-	igt_skip_on(IS_HASWELL(data->devid));
-
 	for_each_connected_output(display, output) {
 		drmModeConnectorPtr c = output->config.connector;
 
@@ -593,7 +602,9 @@  igt_main
 
 		data.devid = intel_get_drm_devid(data.drm_fd);
 
-		igt_require(psr_sink_support(&data));
+		igt_skip_on(!HAS_PSR(data.devid));
+
+		igt_skip_on(!psr_enabled(&data));
 
 		data.bufmgr = drm_intel_bufmgr_gem_init(data.drm_fd, 4096);
 		igt_assert(data.bufmgr);