[igt-dev] [PATCH i-g-t] Revert "kms_content_protection: Set CP prop to UNDESIRED at igt exit."

Ramalingam C ramalingam.c at intel.com
Thu Sep 26 08:48:08 UTC 2019


Committed a older version of the patch by mistake. CI result of previous
patch is mistaken for latest patch. Hence reverting it.

This reverts commit 3dbaca74df003e5f3adef570a0b29b296a653f9c.

Signed-off-by: Ramalingam C <ramalingam.c at intel.com>
cc: Chris Wilson <chris at chris-wilson.co.uk>
---
 tests/kms_content_protection.c | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
index fce4b5910af4..e676b60bf719 100644
--- a/tests/kms_content_protection.c
+++ b/tests/kms_content_protection.c
@@ -617,26 +617,6 @@ test_content_protection(enum igt_commit_style s, int content_type)
 	igt_require_f(valid_tests, "No connector found with HDCP capability\n");
 }
 
-static void test_content_protection_cleanup(void)
-{
-	igt_display_t *display = &data.display;
-	igt_output_t *output;
-	uint64_t val;
-
-	for_each_connected_output(display, output) {
-		if (!output->props[IGT_CONNECTOR_CONTENT_PROTECTION])
-			continue;
-
-		val = igt_output_get_prop(output,
-					  IGT_CONNECTOR_CONTENT_PROTECTION);
-		if (val == CP_UNDESIRED)
-			continue;
-
-		igt_info("CP Prop being UNDESIRED on %s\n", output->name);
-		test_cp_disable(output, COMMIT_ATOMIC);
-	}
-}
-
 igt_main
 {
 	igt_fixture {
@@ -712,8 +692,6 @@ igt_main
 		test_content_protection(COMMIT_ATOMIC, HDCP_CONTENT_TYPE_0);
 	}
 
-	igt_fixture {
-		test_content_protection_cleanup();
+	igt_fixture
 		igt_display_fini(&data.display);
-	}
 }
-- 
2.20.1



More information about the igt-dev mailing list