[i-g-t,1/7] kms_flip: Removes unreachable code related to TEST_RPM

Commit Message

Rodrigo Siqueira March 4, 2019, 3:29 p.m. UTC

This commit removes the code related to TEST_RPM test because the
kms_flip never sets this flags, i.e., TEST_RPM is not used. Take a look
at commit 07a3fccf to see why this flag is never set.

Signed-off-by: Rodrigo Siqueira <[e-mail]>
---
 tests/kms_flip.c | 15 ---------------
 1 file changed, 15 deletions(-)

Patch

diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index 798fc4e8..f769d30e 100755
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -68,7 +68,6 @@ 
 #define TEST_ENOENT		(1 << 22)
 #define TEST_FENCE_STRESS	(1 << 23)
 #define TEST_VBLANK_RACE	(1 << 24)
-#define TEST_RPM		(1 << 25)
 #define TEST_SUSPEND		(1 << 26)
 #define TEST_TS_CONT		(1 << 27)
 #define TEST_BO_TOOBIG		(1 << 28)
@@ -809,9 +808,6 @@  static unsigned int run_test_step(struct test_output *o)
 			     "failed to disable output: %s\n",
 			     strerror(errno));
 
-	if (o->flags & TEST_RPM)
-		igt_assert(igt_wait_for_pm_status(IGT_RUNTIME_PM_STATUS_SUSPENDED));
-
 	if (o->flags & TEST_SUSPEND)
 		igt_system_suspend_autoresume(SUSPEND_STATE_MEM,
 					      SUSPEND_TEST_NONE);
@@ -1321,9 +1317,6 @@  static int run_test(int duration, int flags)
 
 	igt_require((flags & TEST_HANG) == 0 || !is_wedged(drm_fd));
 
-	if (flags & TEST_RPM)
-		igt_require(igt_setup_runtime_pm());
-
 	resources = drmModeGetResources(drm_fd);
 	igt_require(resources);
 
@@ -1570,10 +1563,6 @@  int main(int argc, char **argv)
 		if (tests[i].flags & TEST_NO_2X_OUTPUT)
 			continue;
 
-		/* code doesn't disable all crtcs, so skip rpm tests */
-		if (tests[i].flags & TEST_RPM)
-			continue;
-
 		igt_subtest_f( "2x-%s", tests[i].name)
 			run_pair(tests[i].duration, tests[i].flags);
 	}
@@ -1592,10 +1581,6 @@  int main(int argc, char **argv)
 		if (tests[i].flags & TEST_NO_2X_OUTPUT)
 			continue;
 
-		/* code doesn't disable all crtcs, so skip rpm tests */
-		if (tests[i].flags & TEST_RPM)
-			continue;
-
 		igt_subtest_f( "2x-%s-interruptible", tests[i].name)
 			run_pair(tests[i].duration, tests[i].flags);
 	}