[PATCH i-g-t] tests/kms_async_flips: Do not skip any tests due to Selective Fetch

[PATCH i-g-t] tests/kms_async_flips: Do not skip any tests due to Selective Fetch

[Jouni Högander]

There are recent changes in driver fixing async flip handling when
selective fetch is enabled. There is no need to skip any async flip tests
due to Selective Fetch anymore. Remove checking Selective Fetch.

Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/15791
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
 tests/kms_async_flips.c | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/tests/kms_async_flips.c b/tests/kms_async_flips.c
index 1a4941ef7..abb1d9c10 100644
--- a/tests/kms_async_flips.c
+++ b/tests/kms_async_flips.c
@@ -624,15 +624,6 @@ static void test_cursor(data_t *data)
 
 	igt_display_commit2(&data->display, data->display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
 
-	/*
-	 * Intel's PSR2 selective fetch adds other planes to state when
-	 * necessary, causing the async flip to fail because async flip is not
-	 * supported in cursor plane.
-	 */
-	igt_skip_on_f(i915_psr2_selective_fetch_check(data->drm_fd, NULL),
-		      "PSR2 sel fetch causes cursor to be added to primary plane " \
-		      "pages flips and async flip is not supported in cursor\n");
-
 	do_or_die(drmGetCap(data->drm_fd, DRM_CAP_CURSOR_WIDTH, &width));
 	do_or_die(drmGetCap(data->drm_fd, DRM_CAP_CURSOR_WIDTH, &height));
 
@@ -1172,15 +1163,6 @@ int igt_main()
 	igt_describe("Verify that the DRM_IOCTL_MODE_CURSOR passes after async flip");
 	igt_subtest_with_dynamic("test-cursor") {
 		test_init_ops(&data);
-		/*
-		 * Intel's PSR2 selective fetch adds other planes to state when
-		 * necessary, causing the async flip to fail because async flip is not
-		 * supported in cursor plane.
-		 */
-		igt_skip_on_f(i915_psr2_selective_fetch_check(data.drm_fd, NULL),
-			      "PSR2 sel fetch causes cursor to be added to primary plane "
-			      "pages flips and async flip is not supported in cursor\n");
-
 		run_test(&data, test_cursor);
 	}
 
@@ -1188,14 +1170,6 @@ int igt_main()
 		     "async flip with atomic commit");
 	igt_subtest_with_dynamic("test-cursor-atomic") {
 		test_init_ops(&data);
-		/*
-		 * Intel's PSR2 selective fetch adds other planes to state when
-		 * necessary, causing the async flip to fail because async flip is not
-		 * supported in cursor plane.
-		 */
-		igt_skip_on_f(i915_psr2_selective_fetch_check(data.drm_fd, NULL),
-			      "PSR2 sel fetch causes cursor to be added to primary plane "
-			      "pages flips and async flip is not supported in cursor\n");
 		data.atomic_path = true;
 		run_test(&data, test_cursor);
 	}
-- 
2.43.0

✗ Fi.CI.BUILD: failure for tests/kms_async_flips: Do not skip any tests due to Selective Fetch

[Patchwork]

== Series Details ==

Series: tests/kms_async_flips: Do not skip any tests due to Selective Fetch
URL   : https://patchwork.freedesktop.org/series/162553/
State : failure

== Summary ==

Applying: tests/kms_async_flips: Do not skip any tests due to Selective Fetch
Using index info to reconstruct a base tree...
M	tests/kms_async_flips.c
Falling back to patching base and 3-way merge...
Auto-merging tests/kms_async_flips.c
CONFLICT (content): Merge conflict in tests/kms_async_flips.c
Patch failed at 0001 tests/kms_async_flips: Do not skip any tests due to Selective Fetch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".