Skip to contentSkip to conversation

tests/kms_psr_sink_crc: Make blt visible to human eyes

PATCH In review Rodrigo Vivi 2 participants 6 messages Dec 6, 2014 – Dec 8, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 tests/kms_psr_sink_crc: Make blt visible to human eyes

This will allow manual tests when crc isn't available.

---
 tests/kms_psr_sink_crc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/kms_psr_sink_crc.c +1 -1
index 98b60cf..ad440a8 100644
@@ -123,7 +123,7 @@ static void fill_blt(data_t *data, uint32_t handle, unsigned char color)
 	COLOR_BLIT_COPY_BATCH_START(0);
 	OUT_BATCH((1 << 24) | (0xf0 << 16) | 0);
 	OUT_BATCH(0);
-	OUT_BATCH(1 << 16 | 4);
+	OUT_BATCH(0xfff << 16 | 0xfff);
 	OUT_RELOC(dst, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);
 	OUT_BATCH(color);
 	ADVANCE_BATCH();
Signature · 6 lines
1.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 2/5 tests/kms_psr_sink_crc: Make render visible to human eyes

This will allow manual tests when crc isn't available.

---
 tests/kms_psr_sink_crc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tests/kms_psr_sink_crc.c +2 -2
index ad440a8..892bba6 100644
@@ -139,7 +139,7 @@ static void scratch_buf_init(struct igt_buf *buf, drm_intel_bo *bo)
 	buf->bo = bo;
 	buf->stride = 4096;
 	buf->tiling = I915_TILING_X;
-	buf->size = 4096;
+	buf->size = 4;
 }
 
 static void fill_render(data_t *data, uint32_t handle, unsigned char color)
@@ -167,7 +167,7 @@ static void fill_render(data_t *data, uint32_t handle, unsigned char color)
 	igt_assert(batch);
 
 	rendercopy(batch, NULL,
-		   &src_buf, 0, 0, 1, 1,
+		   &src_buf, 0, 0, 0xff, 0xff,
 		   &dst_buf, 0, 0);
 
 	intel_batchbuffer_free(batch);
Signature · 6 lines
1.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

PATCH 3/5 tests/kms_psr_sink_crc: Make mmaps visible to human eyes

In reply to Rodrigo Vivi

this will allow manual tests when crc isn't available.

---
 tests/kms_psr_sink_crc.c | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)
tests/kms_psr_sink_crc.c +19 -10
index 892bba6..865ac70 100644
@@ -83,6 +83,7 @@ typedef struct {
 	drm_intel_bufmgr *bufmgr;
 	struct igt_fb fb_green, fb_white;
 	igt_plane_t *primary, *sprite, *cursor;
+	int mod_size;
 } data_t;
 
 static void create_cursor_fb(data_t *data)
@@ -335,19 +336,21 @@ static void test_crc(data_t *data)
 		igt_assert(is_green(crc));
 		break;
 	case MMAP_GTT:
-		ptr = gem_mmap__gtt(data->drm_fd, handle, 4096, PROT_WRITE);
+		ptr = gem_mmap__gtt(data->drm_fd, handle, data->mod_size,
+				    PROT_WRITE);
 		gem_set_domain(data->drm_fd, handle,
 			       I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT);
-		memset(ptr, 0, 4);
-		munmap(ptr, 4096);
+		memset(ptr, 0xcc, data->mod_size);
+		munmap(ptr, data->mod_size);
 		break;
 	case MMAP_GTT_WAITING:
-		ptr = gem_mmap__gtt(data->drm_fd, handle, 4096, PROT_WRITE);
+		ptr = gem_mmap__gtt(data->drm_fd, handle, data->mod_size,
+				    PROT_WRITE);
 		gem_set_domain(data->drm_fd, handle,
 			       I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT);
 
 		/* Printing white on white so the screen shouldn't change */
-		memset(ptr, 0xff, 4);
+		memset(ptr, 0xff, data->mod_size);
 		get_sink_crc(data, crc);
 		igt_assert(strcmp(ref_crc, crc) == 0);
 
@@ -355,15 +358,15 @@ static void test_crc(data_t *data)
 		sleep(10);
 
 		/* Now lets print black to change the screen */
-		memset(ptr, 0, 4);
-		munmap(ptr, 4096);
+		memset(ptr, 0, data->mod_size);
+		munmap(ptr, data->mod_size);
 		break;
 	case MMAP_CPU:
-		ptr = gem_mmap__cpu(data->drm_fd, handle, 0, 4096, PROT_WRITE);
+		ptr = gem_mmap__cpu(data->drm_fd, handle, 0, data->mod_size, PROT_WRITE);
 		gem_set_domain(data->drm_fd, handle,
 			       I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
-		memset(ptr, 0, 4);
-		munmap(ptr, 4096);
+		memset(ptr, 0, data->mod_size);
+		munmap(ptr, data->mod_size);
 		gem_sw_finish(data->drm_fd, handle);
 		break;
 	case BLT:
@@ -431,6 +434,9 @@ static void run_test(data_t *data)
 		white_h = mode->hdisplay;
 		white_v = mode->vdisplay;
 
+		/* Ignoring pitch and bpp to avoid changing full screen */
+		data->mod_size = white_h * white_v;
+
 		switch (data->test_plane) {
 		case SPRITE:
 			data->sprite = igt_output_get_plane(output,
@@ -454,6 +460,9 @@ static void run_test(data_t *data)
 			igt_plane_set_fb(data->cursor, NULL);
 			create_cursor_fb(data);
 			igt_plane_set_position(data->cursor, 0, 0);
+
+			/* Cursor is 64 x 64, ignoring pitch and bbp again */
+			data->mod_size = 64 * 64;
 			break;
 		}
 
Signature · 6 lines
1.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

PATCH 4/5 tests/kms_psr_sink_crc: Make plane_move visible to human eyes

In reply to Rodrigo Vivi

this will allow manual tests when crc isn't available.

---
 tests/kms_psr_sink_crc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/kms_psr_sink_crc.c +1 -1
index 865ac70..155c25f 100644
@@ -377,7 +377,7 @@ static void test_crc(data_t *data)
 		break;
 	case PLANE_MOVE:
 		/* Only in use when testing Sprite and Cursor */
-		igt_plane_set_position(test_plane, 1, 1);
+		igt_plane_set_position(test_plane, 500, 500);
 		igt_display_commit(&data->display);
 		break;
 	case PLANE_ONOFF:
Signature · 6 lines
1.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw

PATCH 5/5 tests/kms_psr_sink_crc: Add manual mode.

In reply to Rodrigo Vivi

Sink CRC is the most reliable way to test PSR. However in some platforms apparently auto generated packages force panel to keep calculating CRC invalidating our current sink crc check over debugfs.

So, this manual test help us to find possible gaps on this platforms where we cannot trust on sink crc checks.

---
 tests/kms_psr_sink_crc.c | 74 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 68 insertions(+), 6 deletions(-)
tests/kms_psr_sink_crc.c +68 -6
index 155c25f..3853031 100644
@@ -26,6 +26,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
+#include <termios.h>
 
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
@@ -37,6 +38,7 @@
 #include "igt_aux.h"
 
 bool running_with_psr_disabled;
+bool manual;
 
 #define CRC_BLACK "000000000000"
 
@@ -244,6 +246,9 @@ static void get_sink_crc(data_t *data, char *crc) {
 	int ret;
 	FILE *file;
 
+	if (manual)
+		return;
+
 	file = igt_debugfs_fopen("i915_sink_crc_eDP1", "r");
 	igt_require(file);
 
@@ -271,6 +276,9 @@ static bool is_green(char *crc)
 	unsigned int rh, gh, bh, mask;
 	int ret;
 
+	if (manual)
+		return false;
+
 	sscanf(color_mask, "%4x", &mask);
 
 	memcpy(rs, &crc[0], 4);
@@ -293,6 +301,31 @@ static bool is_green(char *crc)
 		(bh & mask) == 0);
 }
 
+static void assert(bool condition, const char *debug_msg)
+{
+	if (manual) {
+		struct termios oldt, newt;
+		char c;
+
+		igt_info("%s? [Y/n]: ", debug_msg);
+
+		tcgetattr(STDIN_FILENO, &oldt);
+		newt = oldt;
+		newt.c_lflag &= ~(ICANON);
+		tcsetattr(STDIN_FILENO, TCSANOW, &newt);
+		c = getchar();
+		if (c != '\n')
+			igt_info("\n");
+		tcsetattr(STDIN_FILENO, TCSANOW, &oldt);
+
+		if (c == 'n' || c == 'N')
+			igt_fail(-1);
+	} else {
+		igt_debug("%s\n", debug_msg);
+		igt_assert(condition);
+	}
+}
+
 static void test_crc(data_t *data)
 {
 	uint32_t handle = data->fb_white.gem_handle;
@@ -300,18 +333,19 @@ static void test_crc(data_t *data)
 	void *ptr;
 	char ref_crc[12];
 	char crc[12];
+	char manual_debug[50] = "";
 
 	igt_plane_set_fb(data->primary, &data->fb_green);
 	igt_display_commit(&data->display);
 
 	/* Confirm that screen became Green */
 	get_sink_crc(data, ref_crc);
-	igt_assert(is_green(ref_crc));
+	assert(is_green(ref_crc), "screen GREEN");
 
 	/* Confirm screen stays Green after PSR got active */
 	igt_assert(wait_psr_entry(data, 10));
 	get_sink_crc(data, ref_crc);
-	igt_assert(is_green(ref_crc));
+	assert(is_green(ref_crc), "screen GREEN");
 
 	/* Setting a secondary fb/plane */
 	switch (data->test_plane) {
@@ -325,7 +359,10 @@ static void test_crc(data_t *data)
 	/* Confirm it is not Green anymore */
 	igt_assert(wait_psr_entry(data, 10));
 	get_sink_crc(data, ref_crc);
-	igt_assert(!is_green(ref_crc));
+	if (data->test_plane == PRIMARY)
+		assert(!is_green(ref_crc), "screen WHITE");
+	else
+		assert(!is_green(ref_crc), "GREEN background with WHITE box");
 
 	switch (data->op) {
 	case PAGE_FLIP:
@@ -333,7 +370,8 @@ static void test_crc(data_t *data)
 		igt_assert(drmModePageFlip(data->drm_fd, data->crtc_id,
 					   data->fb_green.fb_id, 0, NULL) == 0);
 		get_sink_crc(data, crc);
-		igt_assert(is_green(crc));
+		assert(is_green(crc), "screen GREEN");
+		strcpy(manual_debug, "still GREEN");
 		break;
 	case MMAP_GTT:
 		ptr = gem_mmap__gtt(data->drm_fd, handle, data->mod_size,
@@ -342,6 +380,8 @@ static void test_crc(data_t *data)
 			       I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT);
 		memset(ptr, 0xcc, data->mod_size);
 		munmap(ptr, data->mod_size);
+		strcpy(manual_debug,
+		       "BLACK or TRANSPARENT mark on top of plane in test");
 		break;
 	case MMAP_GTT_WAITING:
 		ptr = gem_mmap__gtt(data->drm_fd, handle, data->mod_size,
@@ -352,7 +392,11 @@ static void test_crc(data_t *data)
 		/* Printing white on white so the screen shouldn't change */
 		memset(ptr, 0xff, data->mod_size);
 		get_sink_crc(data, crc);
-		igt_assert(strcmp(ref_crc, crc) == 0);
+		if (data->test_plane == PRIMARY)
+			assert(strcmp(ref_crc, crc) == 0, "screen WHITE");
+		else
+			assert(strcmp(ref_crc, crc) == 0,
+			       "GREEN background with WHITE box");
 
 		igt_info("Waiting 10s...\n");
 		sleep(10);
@@ -360,6 +404,8 @@ static void test_crc(data_t *data)
 		/* Now lets print black to change the screen */
 		memset(ptr, 0, data->mod_size);
 		munmap(ptr, data->mod_size);
+		strcpy(manual_debug,
+		       "BLACK or TRANSPARENT mark on top of plane in test");
 		break;
 	case MMAP_CPU:
 		ptr = gem_mmap__cpu(data->drm_fd, handle, 0, data->mod_size, PROT_WRITE);
@@ -368,26 +414,34 @@ static void test_crc(data_t *data)
 		memset(ptr, 0, data->mod_size);
 		munmap(ptr, data->mod_size);
 		gem_sw_finish(data->drm_fd, handle);
+		strcpy(manual_debug,
+		       "BLACK or TRANSPARENT mark on top of plane in test");
 		break;
 	case BLT:
 		fill_blt(data, handle, 0);
+		strcpy(manual_debug,
+		       "BLACK or TRANSPARENT mark on top of plane in test");
 		break;
 	case RENDER:
 		fill_render(data, handle, 0);
+		strcpy(manual_debug,
+		       "BLACK or TRANSPARENT mark on top of plane in test");
 		break;
 	case PLANE_MOVE:
 		/* Only in use when testing Sprite and Cursor */
 		igt_plane_set_position(test_plane, 500, 500);
 		igt_display_commit(&data->display);
+		strcpy(manual_debug, "White box moved to 500x500");
 		break;
 	case PLANE_ONOFF:
 		/* Only in use when testing Sprite and Cursor */
 		igt_plane_set_fb(test_plane, NULL);
 		igt_display_commit(&data->display);
+		strcpy(manual_debug, "screen GREEN");
 		break;
 	}
 	get_sink_crc(data, crc);
-	igt_assert(strcmp(ref_crc, crc) != 0);
+	assert(strcmp(ref_crc, crc) != 0, manual_debug);
 }
 
 static void test_cleanup(data_t *data) {
@@ -480,6 +534,9 @@ static int opt_handler(int opt, int opt_index)
 	case 'n':
 		running_with_psr_disabled = true;
 		break;
+	case 'm':
+		manual = true;
+		break;
 	default:
 		igt_assert(0);
 	}
@@ -493,6 +550,7 @@ int main(int argc, char *argv[])
 	       "  --no-psr\tRun test without PSR to check the CRC test logic.";
 	static struct option long_options[] = {
 		{"no-psr", 0, 0, 'n'},
+		{"manual", 0, 0, 'm'},
 		{ 0, 0, 0, 0 }
 	};
 	data_t data = {};
@@ -507,6 +565,10 @@ int main(int argc, char *argv[])
 		kmstest_set_vt_graphics_mode();
 		data.devid = intel_get_drm_devid(data.drm_fd);
 
+		if ((IS_VALLEYVIEW(data.devid) || IS_CHERRYVIEW(data.devid)) &&
+		    !manual)
+			igt_skip("Sink CRC is unreliable on this platform when PSR is enabled. Test available only on manual mode. Run again with --manual\n");
+
 		igt_skip_on(!psr_enabled(&data));
 
 		data.bufmgr = drm_intel_bufmgr_gem_init(data.drm_fd, 4096);
Signature · 6 lines
1.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw

Re: [PATCH 5/5] tests/kms_psr_sink_crc: Add manual mode.

Quoted 53 lines · Rodrigo Vivi

Sink CRC is the most reliable way to test PSR. However in some platforms apparently auto generated packages force panel to keep calculating CRC invalidating our current sink crc check over debugfs.

So, this manual test help us to find possible gaps on this platforms where we cannot trust on sink crc checks.

---
 tests/kms_psr_sink_crc.c | 74 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 68 insertions(+), 6 deletions(-)
tests/kms_psr_sink_crc.c +8 -0
index 155c25f..3853031 100644
@@ -26,6 +26,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
+#include <termios.h>
 
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
@@ -37,6 +38,7 @@
 #include "igt_aux.h"
 
 bool running_with_psr_disabled;
+bool manual;
 
 #define CRC_BLACK "000000000000"
 
@@ -244,6 +246,9 @@ static void get_sink_crc(data_t *data, char *crc) {
 	int ret;
 	FILE *file;
 
+	if (manual)
+		return;
+
 	file = igt_debugfs_fopen("i915_sink_crc_eDP1", "r");
 	igt_require(file);
 
@@ -271,6 +276,9 @@ static bool is_green(char *crc)
 	unsigned int rh, gh, bh, mask;
 	int ret;
 
+	if (manual)
+		return false;
+
 	sscanf(color_mask, "%4x", &mask);
 
 	memcpy(rs, &crc[0], 4);

tests/kms_psr_sink_crc.c static bool is_green(char *crc) · line 304

Quoted 4 lines
tests/kms_psr_sink_crc.c +1 -0
@@ -293,6 +301,31 @@ static bool is_green(char *crc)
 		(bh & mask) == 0);
 }
 
+static void assert(bool condition, const char *debug_msg)

This collides with the libc assert() macro.

Quoted 8 lines
tests/kms_psr_sink_crc.c +8 -0
+{
+	if (manual) {
+		struct termios oldt, newt;
+		char c;
+
+		igt_info("%s? [Y/n]: ", debug_msg);
+
+		tcgetattr(STDIN_FILENO, &oldt);

tests/kms_psr_sink_crc.c static bool is_green(char *crc) · line 322

Quoted 10 lines
tests/kms_psr_sink_crc.c +10 -0
+		newt = oldt;
+		newt.c_lflag &= ~(ICANON);
+		tcsetattr(STDIN_FILENO, TCSANOW, &newt);
+		c = getchar();
+		if (c != '\n')
+			igt_info("\n");
+		tcsetattr(STDIN_FILENO, TCSANOW, &oldt);
+
+		if (c == 'n' || c == 'N')
+			igt_fail(-1);

tbh not sure whether this is all that useful to wait for keypresses and then make the test fail/pass. You need to manually run the testcase anyway. Imo better to just use igt_debug_wait_for_keypress. That one also magically skips if the option hasn't been set. And yeah we might good to add a new common option like --interactive-debug for it instead of just the env variable. You could even reuse that here then (by exporting an igt_interactive_debug boolean or so).

tests/kms_psr_sink_crc.c static bool is_green(char *crc) · line 325

Quoted 3 lines
tests/kms_psr_sink_crc.c +3 -0
+	} else {
+		igt_debug("%s\n", debug_msg);
+		igt_assert(condition);

igt_assert_f. Also I'd just use igt_assert_f(manual || condition) instead, simplifies the control flow.

tests/kms_psr_sink_crc.c static void test_crc(data_t *data) · line 336

Quoted 11 lines
tests/kms_psr_sink_crc.c +4 -0
+	}
+}
+
 static void test_crc(data_t *data)
 {
 	uint32_t handle = data->fb_white.gem_handle;
@@ -300,18 +333,19 @@ static void test_crc(data_t *data)
 	void *ptr;
 	char ref_crc[12];
 	char crc[12];
+	char manual_debug[50] = "";

Just make this a const char * point and assign strings to it. No need for strcpy.

Quoted 142 lines
tests/kms_psr_sink_crc.c +34 -6
 	igt_plane_set_fb(data->primary, &data->fb_green);
 	igt_display_commit(&data->display);
 
 	/* Confirm that screen became Green */
 	get_sink_crc(data, ref_crc);
-	igt_assert(is_green(ref_crc));
+	assert(is_green(ref_crc), "screen GREEN");
 
 	/* Confirm screen stays Green after PSR got active */
 	igt_assert(wait_psr_entry(data, 10));
 	get_sink_crc(data, ref_crc);
-	igt_assert(is_green(ref_crc));
+	assert(is_green(ref_crc), "screen GREEN");
 
 	/* Setting a secondary fb/plane */
 	switch (data->test_plane) {
@@ -325,7 +359,10 @@ static void test_crc(data_t *data)
 	/* Confirm it is not Green anymore */
 	igt_assert(wait_psr_entry(data, 10));
 	get_sink_crc(data, ref_crc);
-	igt_assert(!is_green(ref_crc));
+	if (data->test_plane == PRIMARY)
+		assert(!is_green(ref_crc), "screen WHITE");
+	else
+		assert(!is_green(ref_crc), "GREEN background with WHITE box");
 
 	switch (data->op) {
 	case PAGE_FLIP:
@@ -333,7 +370,8 @@ static void test_crc(data_t *data)
 		igt_assert(drmModePageFlip(data->drm_fd, data->crtc_id,
 					   data->fb_green.fb_id, 0, NULL) == 0);
 		get_sink_crc(data, crc);
-		igt_assert(is_green(crc));
+		assert(is_green(crc), "screen GREEN");
+		strcpy(manual_debug, "still GREEN");
 		break;
 	case MMAP_GTT:
 		ptr = gem_mmap__gtt(data->drm_fd, handle, data->mod_size,
@@ -342,6 +380,8 @@ static void test_crc(data_t *data)
 			       I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT);
 		memset(ptr, 0xcc, data->mod_size);
 		munmap(ptr, data->mod_size);
+		strcpy(manual_debug,
+		       "BLACK or TRANSPARENT mark on top of plane in test");
 		break;
 	case MMAP_GTT_WAITING:
 		ptr = gem_mmap__gtt(data->drm_fd, handle, data->mod_size,
@@ -352,7 +392,11 @@ static void test_crc(data_t *data)
 		/* Printing white on white so the screen shouldn't change */
 		memset(ptr, 0xff, data->mod_size);
 		get_sink_crc(data, crc);
-		igt_assert(strcmp(ref_crc, crc) == 0);
+		if (data->test_plane == PRIMARY)
+			assert(strcmp(ref_crc, crc) == 0, "screen WHITE");
+		else
+			assert(strcmp(ref_crc, crc) == 0,
+			       "GREEN background with WHITE box");
 
 		igt_info("Waiting 10s...\n");
 		sleep(10);
@@ -360,6 +404,8 @@ static void test_crc(data_t *data)
 		/* Now lets print black to change the screen */
 		memset(ptr, 0, data->mod_size);
 		munmap(ptr, data->mod_size);
+		strcpy(manual_debug,
+		       "BLACK or TRANSPARENT mark on top of plane in test");
 		break;
 	case MMAP_CPU:
 		ptr = gem_mmap__cpu(data->drm_fd, handle, 0, data->mod_size, PROT_WRITE);
@@ -368,26 +414,34 @@ static void test_crc(data_t *data)
 		memset(ptr, 0, data->mod_size);
 		munmap(ptr, data->mod_size);
 		gem_sw_finish(data->drm_fd, handle);
+		strcpy(manual_debug,
+		       "BLACK or TRANSPARENT mark on top of plane in test");
 		break;
 	case BLT:
 		fill_blt(data, handle, 0);
+		strcpy(manual_debug,
+		       "BLACK or TRANSPARENT mark on top of plane in test");
 		break;
 	case RENDER:
 		fill_render(data, handle, 0);
+		strcpy(manual_debug,
+		       "BLACK or TRANSPARENT mark on top of plane in test");
 		break;
 	case PLANE_MOVE:
 		/* Only in use when testing Sprite and Cursor */
 		igt_plane_set_position(test_plane, 500, 500);
 		igt_display_commit(&data->display);
+		strcpy(manual_debug, "White box moved to 500x500");
 		break;
 	case PLANE_ONOFF:
 		/* Only in use when testing Sprite and Cursor */
 		igt_plane_set_fb(test_plane, NULL);
 		igt_display_commit(&data->display);
+		strcpy(manual_debug, "screen GREEN");
 		break;
 	}
 	get_sink_crc(data, crc);
-	igt_assert(strcmp(ref_crc, crc) != 0);
+	assert(strcmp(ref_crc, crc) != 0, manual_debug);
 }
 
 static void test_cleanup(data_t *data) {
@@ -480,6 +534,9 @@ static int opt_handler(int opt, int opt_index)
 	case 'n':
 		running_with_psr_disabled = true;
 		break;
+	case 'm':
+		manual = true;
+		break;
 	default:
 		igt_assert(0);
 	}
@@ -493,6 +550,7 @@ int main(int argc, char *argv[])
 	       "  --no-psr\tRun test without PSR to check the CRC test logic.";
 	static struct option long_options[] = {
 		{"no-psr", 0, 0, 'n'},
+		{"manual", 0, 0, 'm'},
 		{ 0, 0, 0, 0 }
 	};
 	data_t data = {};
@@ -507,6 +565,10 @@ int main(int argc, char *argv[])
 		kmstest_set_vt_graphics_mode();
 		data.devid = intel_get_drm_devid(data.drm_fd);
 
+		if ((IS_VALLEYVIEW(data.devid) || IS_CHERRYVIEW(data.devid)) &&
+		    !manual)
+			igt_skip("Sink CRC is unreliable on this platform when PSR is enabled. Test available only on manual mode. Run again with --manual\n");
+
 		igt_skip_on(!psr_enabled(&data));
 
 		data.bufmgr = drm_intel_bufmgr_gem_init(data.drm_fd, 4096);
Signature · 6 lines
1.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx