Skip to contentSkip to conversation

kms_atomic_transition: Remove skip_on_unsupported_nonblocking_modeset.

PATCH In review Maarten Lankhorst 3 participants 5 messages Jan 3, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kms_atomic_transition: Remove skip_on_unsupported_nonblocking_modeset.

This weas a workaround to gracefully skip on i915 before nonblocking modeset support was added, but this is no longer needed. Remove the code, since it's safe to always assume such support is enabled.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104471

---
 tests/kms_atomic_transition.c | 47 -------------------------------------------
 1 file changed, 47 deletions(-)
tests/kms_atomic_transition.c +0 -47
index 54581ed7cd96..798639393421 100644
@@ -148,33 +148,6 @@ wm_setup_plane(igt_display_t *display, enum pipe pipe,
 	}
 }
 
-static bool skip_on_unsupported_nonblocking_modeset(igt_display_t *display)
-{
-	enum pipe pipe;
-	int ret;
-
-	/*
-	 * Make sure we only skip when the suggested configuration is
-	 * unsupported by committing it first with TEST_ONLY, if it's
-	 * unsupported -EINVAL is returned. If the second commit returns
-	 * -EINVAL, it's from not being able to support nonblocking modeset.
-	 */
-	igt_display_commit_atomic(display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
-
-	ret = igt_display_try_commit_atomic(display, DRM_MODE_ATOMIC_ALLOW_MODESET | DRM_MODE_ATOMIC_NONBLOCK, NULL);
-
-	if (ret == -EINVAL)
-		return true;
-
-	igt_assert_eq(ret, 0);
-
-	/* Force the next state to update all crtc's, to synchronize with the nonblocking modeset. */
-	for_each_pipe(display, pipe)
-		igt_pipe_refresh(display, pipe, false);
-
-	return false;
-}
-
 static void ev_page_flip(int fd, unsigned seq, unsigned tv_sec, unsigned tv_usec, void *user_data)
 {
 	igt_debug("Retrieved vblank seq: %u on unk\n", seq);
@@ -421,7 +394,6 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
 	igt_pipe_t *pipe_obj = &display->pipes[pipe];
 	uint32_t iter_max = 1 << pipe_obj->n_planes, i;
 	struct plane_parms parms[pipe_obj->n_planes];
-	bool skip_test = false;
 	unsigned flags = 0;
 	int ret;
 
@@ -448,10 +420,6 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
 	wm_setup_plane(display, pipe, 0, NULL, false);
 
 	if (flags & DRM_MODE_ATOMIC_ALLOW_MODESET) {
-		skip_test = nonblocking && skip_on_unsupported_nonblocking_modeset(display);
-		if (skip_test)
-			goto cleanup;
-
 		igt_output_set_pipe(output, PIPE_NONE);
 
 		igt_display_commit2(display, COMMIT_ATOMIC);
@@ -594,8 +562,6 @@ cleanup:
 	igt_remove_fb(display->drm_fd, &fb);
 	igt_remove_fb(display->drm_fd, &argb_fb);
 	igt_remove_fb(display->drm_fd, &sprite_fb);
-	if (skip_test)
-		igt_skip("Atomic nonblocking modesets are not supported.\n");
 }
 
 static void commit_display(igt_display_t *display, unsigned event_mask, bool nonblocking)
@@ -719,7 +685,6 @@ static void run_modeset_tests(igt_display_t *display, int howmany, bool nonblock
 	igt_pipe_crc_t *pipe_crcs[IGT_MAX_PIPES] = { 0 };
 	igt_output_t *output;
 	unsigned width = 0, height = 0;
-	bool skip_test = false;
 
 	for_each_connected_output(display, output) {
 		drmModeModeInfo *mode = igt_output_get_mode(output);
@@ -763,13 +728,6 @@ static void run_modeset_tests(igt_display_t *display, int howmany, bool nonblock
 			igt_plane_set_fb(plane, NULL);
 	}
 
-	/*
-	 * When i915 supports nonblocking modeset, this if branch can be removed.
-	 * It's only purpose is to ensure nonblocking modeset works.
-	 */
-	if (nonblocking && (skip_test = skip_on_unsupported_nonblocking_modeset(display)))
-		goto cleanup;
-
 	igt_display_commit2(display, COMMIT_ATOMIC);
 
 	for (i = 0; i < iter_max; i++) {
@@ -832,7 +790,6 @@ static void run_modeset_tests(igt_display_t *display, int howmany, bool nonblock
 		}
 	}
 
-cleanup:
 	set_combinations(display, 0, NULL);
 	igt_display_commit2(display, COMMIT_ATOMIC);
 
@@ -842,10 +799,6 @@ cleanup:
 
 	igt_remove_fb(display->drm_fd, &fbs[1]);
 	igt_remove_fb(display->drm_fd, &fbs[0]);
-
-	if (skip_test)
-		igt_skip("Atomic nonblocking modesets are not supported.\n");
-
 }
 
 static void run_modeset_transition(igt_display_t *display, int requested_outputs, bool nonblocking, bool fencing)
Signature · 6 lines
2.15.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#1 lore raw
Quoted 147 lines

-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Maarten Lankhorst
Sent: Wednesday, January 3, 2018 11:19 AM
To: [email protected]
Subject: [Intel-gfx] [PATCH i-g-t] kms_atomic_transition: Remove skip_on_unsupported_nonblocking_modeset.

This weas a workaround to gracefully skip on i915 before nonblocking modeset support was added, but this is no longer needed. Remove the code, since it's safe to always assume such support is enabled.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104471

---
 tests/kms_atomic_transition.c | 47 -------------------------------------------
 1 file changed, 47 deletions(-)
tests/kms_atomic_transition.c +0 -8
index 54581ed7cd96..798639393421 100644
@@ -148,33 +148,6 @@ wm_setup_plane(igt_display_t *display, enum pipe
 pipe,
 	}
 }
 
-static bool skip_on_unsupported_nonblocking_modeset(igt_display_t
 *display) -{
-	enum pipe pipe;
-	int ret;
-
-	/*
-	 * Make sure we only skip when the suggested configuration is
-	 * unsupported by committing it first with TEST_ONLY, if it's
-	 * unsupported -EINVAL is returned. If the second commit

returns

tests/kms_atomic_transition.c +0 -1
-	 * -EINVAL, it's from not being able to support nonblocking

modeset.

tests/kms_atomic_transition.c +0 -2
-	 */
-	igt_display_commit_atomic(display,

DRM_MODE_ATOMIC_TEST_ONLY |
DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);

tests/kms_atomic_transition.c +0 -2
-
-	ret = igt_display_try_commit_atomic(display,

DRM_MODE_ATOMIC_ALLOW_MODESET |
DRM_MODE_ATOMIC_NONBLOCK, NULL);

tests/kms_atomic_transition.c +0 -7
-
-	if (ret == -EINVAL)
-		return true;
-
-	igt_assert_eq(ret, 0);
-
-	/* Force the next state to update all crtc's, to synchronize with

the nonblocking modeset. */

tests/kms_atomic_transition.c +0 -6
-	for_each_pipe(display, pipe)
-		igt_pipe_refresh(display, pipe, false);
-
-	return false;
-}
-
 static void ev_page_flip(int fd, unsigned seq, unsigned tv_sec, unsigned

tv_usec, void *user_data) {
igt_debug("Retrieved vblank seq: %u on unk\n", seq); @@ -
421,7 +394,6 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output

tests/kms_atomic_transition.c +0 -1
 	igt_pipe_t *pipe_obj = &display->pipes[pipe];
 	uint32_t iter_max = 1 << pipe_obj->n_planes, i;
 	struct plane_parms parms[pipe_obj->n_planes];
-	bool skip_test = false;
 	unsigned flags = 0;
 	int ret;
@@ -448,10 +420,6 @@ run_transition_test(igt_display_t *display, enum

pipe pipe, igt_output_t *output

tests/kms_atomic_transition.c +0 -1
 	wm_setup_plane(display, pipe, 0, NULL, false);
 
 	if (flags & DRM_MODE_ATOMIC_ALLOW_MODESET) {
-		skip_test = nonblocking &&

skip_on_unsupported_nonblocking_modeset(display);

tests/kms_atomic_transition.c +0 -3
-		if (skip_test)
-			goto cleanup;
-
 		igt_output_set_pipe(output, PIPE_NONE);
 
 		igt_display_commit2(display,

COMMIT_ATOMIC); @@ -594,8 +562,6 @@ cleanup:

tests/kms_atomic_transition.c +0 -2
 	igt_remove_fb(display->drm_fd, &fb);
 	igt_remove_fb(display->drm_fd, &argb_fb);
 	igt_remove_fb(display->drm_fd, &sprite_fb);
-	if (skip_test)
-		igt_skip("Atomic nonblocking modesets are not

supported.\n");
}

static void commit_display(igt_display_t *display, unsigned event_mask,
bool nonblocking) @@ -719,7 +685,6 @@ static void run_modeset_tests(igt_display_t *display, int howmany, bool nonblock

tests/kms_atomic_transition.c +0 -1
 	igt_pipe_crc_t *pipe_crcs[IGT_MAX_PIPES] = { 0 };
 	igt_output_t *output;
 	unsigned width = 0, height = 0;
-	bool skip_test = false;
 
 	for_each_connected_output(display, output) {
 		drmModeModeInfo *mode =

igt_output_get_mode(output); @@ -763,13 +728,6 @@ static void run_modeset_tests(igt_display_t *display, int howmany, bool nonblock

tests/kms_atomic_transition.c +0 -2
 			igt_plane_set_fb(plane, NULL);
 	}
 
-	/*
-	 * When i915 supports nonblocking modeset, this if branch can

be removed.

tests/kms_atomic_transition.c +0 -3
-	 * It's only purpose is to ensure nonblocking modeset works.
-	 */
-	if (nonblocking && (skip_test =

skip_on_unsupported_nonblocking_modeset(display)))

tests/kms_atomic_transition.c +0 -2
-		goto cleanup;
-
 	igt_display_commit2(display, COMMIT_ATOMIC);
 
 	for (i = 0; i < iter_max; i++) {
@@ -832,7 +790,6 @@ static void run_modeset_tests(igt_display_t *display,

int howmany, bool nonblock

tests/kms_atomic_transition.c +0 -5
 		}
 	}
 
-cleanup:
 	set_combinations(display, 0, NULL);
 	igt_display_commit2(display, COMMIT_ATOMIC);
@@ -842,10 +799,6 @@ cleanup:
 
 	igt_remove_fb(display->drm_fd, &fbs[1]);
 	igt_remove_fb(display->drm_fd, &fbs[0]);
-
-	if (skip_test)
-		igt_skip("Atomic nonblocking modesets are not
 supported.\n");
-
 }
 

static void run_modeset_transition(igt_display_t *display, int
requested_outputs, bool nonblocking, bool fencing)
--
2.15.1

Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

✓ Fi.CI.BAT: success for kms_atomic_transition: Remove skip_on_unsupported_nonblocking_modeset.

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: kms_atomic_transition: Remove skip_on_unsupported_nonblocking_modeset.
URL : https://patchwork.freedesktop.org/series/35934/
State : success

== Summary ==

IGT patchset tested on top of latest successful build d86d53b072b50172309abf21ecb521bd70c5fc73 tests/kms_cursor_legacy: Rework the 2x-*-vs-cursor-* tests.

with latest DRM-Tip kernel build CI_DRM_3588
df8878303090 drm-tip: 2018y-01m-02d-15h-31m-30s UTC integration manifest

No testlist changes.

Test debugfs_test:

        Subgroup read_all_entries:
                dmesg-warn -> FAIL       (fi-elk-e7500) fdo#103989 +2
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-a:
                dmesg-warn -> PASS       (fi-kbl-r) fdo#104172 +1
        Subgroup suspend-read-crc-pipe-b:
                pass       -> INCOMPLETE (fi-snb-2520m) fdo#103713

fdo#103989 https://bugs.freedesktop.org/show_bug.cgi?id=103989
fdo#104172 https://bugs.freedesktop.org/show_bug.cgi?id=104172
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713

fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:437s
fi-bdw-gvtdvm    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:443s
fi-blb-e6850     total:288  pass:223  dwarn:1   dfail:0   fail:0   skip:64  time:379s
fi-bsw-n3050     total:288  pass:242  dwarn:0   dfail:0   fail:0   skip:46  time:500s
fi-bwr-2160      total:288  pass:183  dwarn:0   dfail:0   fail:0   skip:105 time:276s
fi-bxt-dsi       total:288  pass:258  dwarn:0   dfail:0   fail:0   skip:30  time:496s
fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:500s
fi-byt-j1900     total:288  pass:253  dwarn:0   dfail:0   fail:0   skip:35  time:482s
fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:472s
fi-elk-e7500     total:224  pass:168  dwarn:9   dfail:0   fail:1   skip:45 
fi-gdg-551       total:288  pass:179  dwarn:0   dfail:0   fail:1   skip:108 time:263s
fi-glk-1         total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:523s
fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:404s
fi-hsw-4770r     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:418s
fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:424s
fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:474s
fi-ivb-3770      total:288  pass:255  dwarn:0   dfail:0   fail:0   skip:33  time:431s
fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:479s
fi-kbl-7560u     total:288  pass:268  dwarn:1   dfail:0   fail:0   skip:19  time:509s
fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:467s
fi-kbl-r         total:288  pass:260  dwarn:1   dfail:0   fail:0   skip:27  time:513s
fi-pnv-d510      total:288  pass:222  dwarn:1   dfail:0   fail:0   skip:65  time:594s
fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:447s
fi-skl-6600u     total:288  pass:260  dwarn:1   dfail:0   fail:0   skip:27  time:520s
fi-skl-6700hq    total:288  pass:261  dwarn:1   dfail:0   fail:0   skip:26  time:543s
fi-skl-6700k2    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:507s
fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:489s
fi-skl-gvtdvm    total:288  pass:265  dwarn:0   dfail:0   fail:0   skip:23  time:445s
fi-snb-2520m     total:245  pass:211  dwarn:0   dfail:0   fail:0   skip:33 
fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:412s
Blacklisted hosts:
fi-cfl-s2        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:581s
fi-cnl-y         total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:614s
fi-glk-dsi       total:288  pass:258  dwarn:0   dfail:0   fail:0   skip:30  time:476s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_735/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

✓ Fi.CI.IGT: success for kms_atomic_transition: Remove skip_on_unsupported_nonblocking_modeset.

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: kms_atomic_transition: Remove skip_on_unsupported_nonblocking_modeset.
URL : https://patchwork.freedesktop.org/series/35934/
State : success

== Summary ==

Test kms_flip:

        Subgroup blt-wf_vblank-vs-modeset:
                skip       -> PASS       (shard-hsw)
        Subgroup dpms-off-confusion-interruptible:
                skip       -> PASS       (shard-hsw)
        Subgroup vblank-vs-suspend-interruptible:
                notrun     -> INCOMPLETE (shard-hsw) fdo#100368
Test kms_vblank:
        Subgroup wait-busy:
                skip       -> PASS       (shard-hsw)
Test pm_rpm:
        Subgroup modeset-stress-extra-wait:
                skip       -> PASS       (shard-hsw)
Test kms_atomic_transition:
        Subgroup 1x-modeset-transitions-nonblocking-fencing:
                fail       -> PASS       (shard-snb) fdo#104471 +3
Test kms_plane:
        Subgroup plane-position-hole-dpms-pipe-c-planes:
                incomplete -> PASS       (shard-hsw) fdo#104152
Test kms_frontbuffer_tracking:
        Subgroup fbc-1p-offscren-pri-shrfb-draw-blt:
                pass       -> FAIL       (shard-snb) fdo#101623 +1
Test drm_read:
        Subgroup short-buffer-block:
                skip       -> PASS       (shard-hsw)
Test gem_tiled_swapping:
        Subgroup non-threaded:
                incomplete -> PASS       (shard-snb) fdo#104218 +1
Test gem_eio:
        Subgroup in-flight-contexts:
                pass       -> DMESG-WARN (shard-snb) fdo#104058

fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#104471 https://bugs.freedesktop.org/show_bug.cgi?id=104471
fdo#104152 https://bugs.freedesktop.org/show_bug.cgi?id=104152
fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
fdo#104218 https://bugs.freedesktop.org/show_bug.cgi?id=104218
fdo#104058 https://bugs.freedesktop.org/show_bug.cgi?id=104058

shard-hsw        total:2657 pass:1513 dwarn:1   dfail:0   fail:11  skip:1131 time:9126s
shard-snb        total:2713 pass:1309 dwarn:2   dfail:0   fail:11  skip:1391 time:8119s
Blacklisted hosts:
shard-apl        total:2713 pass:1681 dwarn:1   dfail:0   fail:30  skip:1001 time:13833s
shard-kbl        total:2713 pass:1805 dwarn:1   dfail:0   fail:28  skip:879 time:11179s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_735/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx