All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH i-g-t 0/3] kms_ccs improvements
@ 2017-08-28  5:17 Gabriel Krisman Bertazi
  2017-08-28  5:17 ` [PATCH i-g-t 1/3] tests/kms_ccs: Test pipes other than pipe A Gabriel Krisman Bertazi
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Gabriel Krisman Bertazi @ 2017-08-28  5:17 UTC (permalink / raw)
  To: intel-gfx; +Cc: daniel.vetter

Hi,

This is a first set of improvements for kms_ccs testcase. More is coming
later today/tomorrow, but I could use feedback on the testcase from
patch 3/3, because that's my first time adding a subtestcase to igt.

Also, patch 1 uncovered a crash triggered inside libdrm (drmModeAddFB)
when running tests for pipe C (only).  I'm not sure what is the root
cause, but the crash happens when reading data from the kernel, so maybe
we got something wrong on libdrm/kernel side.  I'll be debugging it
first thing in the morning.  Still, I'm sure it is *not* a side effect
of my patch.

Gabriel Krisman Bertazi (3):
  tests/kms_ccs: Test pipes other than pipe A
  tests/kms_ccs: Prevent segfault if pipe is not supported
  tests/kms_ccs: Test case where the CCS buffer was not provided

 tests/kms_ccs.c | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH i-g-t 1/3] tests/kms_ccs: Test pipes other than pipe A
  2017-08-28  5:17 [PATCH i-g-t 0/3] kms_ccs improvements Gabriel Krisman Bertazi
@ 2017-08-28  5:17 ` Gabriel Krisman Bertazi
  2017-08-28  5:17 ` [PATCH i-g-t 2/3] tests/kms_ccs: Prevent segfault if pipe is not supported Gabriel Krisman Bertazi
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Gabriel Krisman Bertazi @ 2017-08-28  5:17 UTC (permalink / raw)
  To: intel-gfx; +Cc: daniel.vetter

Commit d41c4ccbd2f9 ("tests/kms_ccs: Fix subtest enumeration")
accidently removed the update of data.pipe, causing kms_ccs to silently
only test PIPE_A.

This fixes the behavior reported by Daniel Vetter where tests would
succeed even on nonexistent pipes.

Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
---
 tests/kms_ccs.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/kms_ccs.c b/tests/kms_ccs.c
index ab9325d14991..775c6999699f 100644
--- a/tests/kms_ccs.c
+++ b/tests/kms_ccs.c
@@ -483,6 +483,8 @@ igt_main
 		const char *pipe_name = kmstest_pipe_name(pipe);
 		int sprite_idx = 0;
 
+		data.pipe = pipe;
+
 		data.flags = TEST_BAD_PIXEL_FORMAT;
 		igt_subtest_f("pipe-%s-bad-pixel-format", pipe_name)
 			test_output(&data);
-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH i-g-t 2/3] tests/kms_ccs: Prevent segfault if pipe is not supported
  2017-08-28  5:17 [PATCH i-g-t 0/3] kms_ccs improvements Gabriel Krisman Bertazi
  2017-08-28  5:17 ` [PATCH i-g-t 1/3] tests/kms_ccs: Test pipes other than pipe A Gabriel Krisman Bertazi
@ 2017-08-28  5:17 ` Gabriel Krisman Bertazi
  2017-08-28  5:17 ` [PATCH i-g-t 3/3] tests/kms_ccs: Test case where the CCS buffer was not provided Gabriel Krisman Bertazi
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Gabriel Krisman Bertazi @ 2017-08-28  5:17 UTC (permalink / raw)
  To: intel-gfx; +Cc: daniel.vetter

for_each_plane_on_pipe() indexes bad memory when iterating over an invalid
pipe.  Make sure the pipe exists before trying to use it.  This prevents
the crash below:

root@ideacentre:~# igt-gpu-tools/tests/kms_ccs --r pipe-D-crc-sprite-planes-basic
IGT-Version: 1.19-g59f0e3d182a8 (x86_64) (Linux: 4.13.0-rc6.intel-boxes+x86_64)
Received signal SIGSEGV.
Stack trace:
 #0 [fatal_sig_handler+0x185]
 #1 [killpg+0x40]
 #2 [__real_main485+0x2de]
 #3 [main+0x3f]
 #4 [__libc_start_main+0xf1]
 #5 [_start+0x2a]
 #6 [<unknown>+0x2a]
Subtest pipe-D-crc-sprite-planes-basic: CRASH (0.004s)

Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
---
 tests/kms_ccs.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/kms_ccs.c b/tests/kms_ccs.c
index 775c6999699f..73025a1e019f 100644
--- a/tests/kms_ccs.c
+++ b/tests/kms_ccs.c
@@ -503,6 +503,9 @@ igt_main
 
 		data.flags = TEST_CRC;
 		igt_subtest_f("pipe-%s-crc-sprite-planes-basic", pipe_name) {
+
+			igt_display_require_output_on_pipe(&data.display, data.pipe);
+
 			for_each_plane_on_pipe(&data.display, data.pipe, data.plane) {
 				if (data.plane->type == DRM_PLANE_TYPE_PRIMARY)
 					continue;
-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH i-g-t 3/3] tests/kms_ccs: Test case where the CCS buffer was not provided
  2017-08-28  5:17 [PATCH i-g-t 0/3] kms_ccs improvements Gabriel Krisman Bertazi
  2017-08-28  5:17 ` [PATCH i-g-t 1/3] tests/kms_ccs: Test pipes other than pipe A Gabriel Krisman Bertazi
  2017-08-28  5:17 ` [PATCH i-g-t 2/3] tests/kms_ccs: Prevent segfault if pipe is not supported Gabriel Krisman Bertazi
@ 2017-08-28  5:17 ` Gabriel Krisman Bertazi
  2017-08-28  5:35 ` ✓ Fi.CI.BAT: success for kms_ccs improvements Patchwork
  2017-08-28  6:40 ` ✗ Fi.CI.IGT: failure " Patchwork
  4 siblings, 0 replies; 6+ messages in thread
From: Gabriel Krisman Bertazi @ 2017-08-28  5:17 UTC (permalink / raw)
  To: intel-gfx; +Cc: daniel.vetter

Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
---
 tests/kms_ccs.c | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/tests/kms_ccs.c b/tests/kms_ccs.c
index 73025a1e019f..33d1369cd59b 100644
--- a/tests/kms_ccs.c
+++ b/tests/kms_ccs.c
@@ -33,8 +33,12 @@ enum test_flags {
 	TEST_ROTATE_180			= 1 << 2,
 	TEST_BAD_PIXEL_FORMAT		= 1 << 3,
 	TEST_BAD_ROTATION_90		= 1 << 4,
+	TEST_NO_AUX_BUFFER		= 1 << 5,
 };
 
+#define TEST_FAIL_ON_ADDFB2 \
+	(TEST_BAD_PIXEL_FORMAT | TEST_NO_AUX_BUFFER)
+
 enum test_fb_flags {
 	FB_COMPRESSED			= 1 << 0,
 	FB_HAS_PLANE			= 1 << 1,
@@ -321,16 +325,19 @@ static void generate_fb(data_t *data, struct igt_fb *fb,
 		size[1] = f.pitches[1] * ALIGN(ccs_height, 32);
 
 		f.handles[0] = gem_create(data->drm_fd, size[0] + size[1]);
-		f.handles[1] = f.handles[0];
-		render_ccs(data, f.handles[1], f.offsets[1], size[1],
-			   height, f.pitches[1]);
+
+		if (!(data->flags & TEST_NO_AUX_BUFFER)) {
+			f.handles[1] = f.handles[0];
+			render_ccs(data, f.handles[1], f.offsets[1], size[1],
+				   height, f.pitches[1]);
+		}
 	} else
 		f.handles[0] = gem_create(data->drm_fd, size[0]);
 
 	render_fb(data, f.handles[0], size[0], fb_flags, height, f.pitches[0]);
 
 	ret = drmIoctl(data->drm_fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f);
-	if (data->flags & TEST_BAD_PIXEL_FORMAT) {
+	if (data->flags & TEST_FAIL_ON_ADDFB2) {
 		igt_assert_eq(ret, -1);
 		igt_assert_eq(errno, EINVAL);
 		return;
@@ -379,7 +386,7 @@ static void try_config(data_t *data, enum test_fb_flags fb_flags)
 			    drm_mode->vdisplay, fb_flags);
 	}
 
-	if (data->flags & TEST_BAD_PIXEL_FORMAT)
+	if (data->flags & TEST_FAIL_ON_ADDFB2)
 		return;
 
 	igt_plane_set_position(primary, 0, 0);
@@ -446,7 +453,8 @@ static void test_output(data_t *data)
 	}
 
 	if (data->flags & TEST_BAD_PIXEL_FORMAT ||
-	    data->flags & TEST_BAD_ROTATION_90) {
+	    data->flags & TEST_BAD_ROTATION_90 ||
+	    data->flags & TEST_NO_AUX_BUFFER) {
 		try_config(data, fb_flags | FB_COMPRESSED);
 	}
 
@@ -514,6 +522,10 @@ igt_main
 			}
 		}
 
+		data.flags = TEST_NO_AUX_BUFFER;
+		igt_subtest_f("pipe-%s-missing-ccs-buffer", pipe_name)
+			test_output(&data);
+
 		data.plane = NULL;
 	}
 
-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* ✓ Fi.CI.BAT: success for kms_ccs improvements
  2017-08-28  5:17 [PATCH i-g-t 0/3] kms_ccs improvements Gabriel Krisman Bertazi
                   ` (2 preceding siblings ...)
  2017-08-28  5:17 ` [PATCH i-g-t 3/3] tests/kms_ccs: Test case where the CCS buffer was not provided Gabriel Krisman Bertazi
@ 2017-08-28  5:35 ` Patchwork
  2017-08-28  6:40 ` ✗ Fi.CI.IGT: failure " Patchwork
  4 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2017-08-28  5:35 UTC (permalink / raw)
  To: Gabriel Krisman Bertazi; +Cc: intel-gfx

== Series Details ==

Series: kms_ccs improvements
URL   : https://patchwork.freedesktop.org/series/29408/
State : success

== Summary ==

IGT patchset tested on top of latest successful build
60f6a12195395934f179d5ecc080353190d19a6c tests: chamelium: Eliminate reset when preparing output

with latest DRM-Tip kernel build CI_DRM_3009
c52f5322612a drm-tip: 2017y-08m-26d-11h-41m-06s UTC integration manifest

Test kms_cursor_legacy:
        Subgroup basic-busy-flip-before-cursor-atomic:
                fail       -> PASS       (fi-snb-2600) fdo#100215 +1
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-c:
                pass       -> FAIL       (fi-skl-6700k) fdo#100367

fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fdo#100367 https://bugs.freedesktop.org/show_bug.cgi?id=100367

fi-bdw-5557u     total:279  pass:268  dwarn:0   dfail:0   fail:0   skip:11  time:454s
fi-bdw-gvtdvm    total:279  pass:265  dwarn:0   dfail:0   fail:0   skip:14  time:441s
fi-blb-e6850     total:279  pass:224  dwarn:1   dfail:0   fail:0   skip:54  time:364s
fi-bsw-n3050     total:279  pass:243  dwarn:0   dfail:0   fail:0   skip:36  time:553s
fi-bwr-2160      total:279  pass:184  dwarn:0   dfail:0   fail:0   skip:95  time:252s
fi-bxt-j4205     total:279  pass:260  dwarn:0   dfail:0   fail:0   skip:19  time:517s
fi-byt-j1900     total:279  pass:254  dwarn:1   dfail:0   fail:0   skip:24  time:521s
fi-byt-n2820     total:279  pass:250  dwarn:1   dfail:0   fail:0   skip:28  time:527s
fi-elk-e7500     total:279  pass:230  dwarn:0   dfail:0   fail:0   skip:49  time:437s
fi-glk-2a        total:279  pass:260  dwarn:0   dfail:0   fail:0   skip:19  time:608s
fi-hsw-4770      total:279  pass:263  dwarn:0   dfail:0   fail:0   skip:16  time:448s
fi-hsw-4770r     total:279  pass:263  dwarn:0   dfail:0   fail:0   skip:16  time:422s
fi-ilk-650       total:279  pass:229  dwarn:0   dfail:0   fail:0   skip:50  time:421s
fi-ivb-3520m     total:279  pass:261  dwarn:0   dfail:0   fail:0   skip:18  time:510s
fi-ivb-3770      total:279  pass:261  dwarn:0   dfail:0   fail:0   skip:18  time:477s
fi-kbl-7500u     total:279  pass:261  dwarn:0   dfail:0   fail:0   skip:18  time:480s
fi-kbl-7560u     total:279  pass:269  dwarn:0   dfail:0   fail:0   skip:10  time:598s
fi-kbl-r         total:279  pass:261  dwarn:0   dfail:0   fail:0   skip:18  time:600s
fi-pnv-d510      total:279  pass:223  dwarn:1   dfail:0   fail:0   skip:55  time:526s
fi-skl-6260u     total:279  pass:269  dwarn:0   dfail:0   fail:0   skip:10  time:465s
fi-skl-6700k     total:279  pass:260  dwarn:0   dfail:0   fail:1   skip:18  time:460s
fi-skl-6770hq    total:279  pass:269  dwarn:0   dfail:0   fail:0   skip:10  time:488s
fi-skl-gvtdvm    total:279  pass:266  dwarn:0   dfail:0   fail:0   skip:13  time:440s
fi-skl-x1585l    total:279  pass:268  dwarn:0   dfail:0   fail:0   skip:11  time:485s
fi-snb-2520m     total:279  pass:251  dwarn:0   dfail:0   fail:0   skip:28  time:552s
fi-snb-2600      total:279  pass:250  dwarn:0   dfail:0   fail:0   skip:29  time:402s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_107/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread
* ✗ Fi.CI.IGT: failure for kms_ccs improvements
  2017-08-28  5:17 [PATCH i-g-t 0/3] kms_ccs improvements Gabriel Krisman Bertazi
                   ` (3 preceding siblings ...)
  2017-08-28  5:35 ` ✓ Fi.CI.BAT: success for kms_ccs improvements Patchwork
@ 2017-08-28  6:40 ` Patchwork
  4 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2017-08-28  6:40 UTC (permalink / raw)
  To: Gabriel Krisman Bertazi; +Cc: intel-gfx

== Series Details ==

Series: kms_ccs improvements
URL   : https://patchwork.freedesktop.org/series/29408/
State : failure

== Summary ==

Test vgem_basic:
        Subgroup unload:
                pass       -> SKIP       (shard-hsw)
Test gem_basic:
        Subgroup create-fd-close:
                pass       -> INCOMPLETE (shard-hsw)

shard-hsw        total:2236 pass:1211 dwarn:0   dfail:0   fail:16  skip:965 time:9449s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_107/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-08-28  6:40 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-28  5:17 [PATCH i-g-t 0/3] kms_ccs improvements Gabriel Krisman Bertazi
2017-08-28  5:17 ` [PATCH i-g-t 1/3] tests/kms_ccs: Test pipes other than pipe A Gabriel Krisman Bertazi
2017-08-28  5:17 ` [PATCH i-g-t 2/3] tests/kms_ccs: Prevent segfault if pipe is not supported Gabriel Krisman Bertazi
2017-08-28  5:17 ` [PATCH i-g-t 3/3] tests/kms_ccs: Test case where the CCS buffer was not provided Gabriel Krisman Bertazi
2017-08-28  5:35 ` ✓ Fi.CI.BAT: success for kms_ccs improvements Patchwork
2017-08-28  6:40 ` ✗ Fi.CI.IGT: failure " Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.