Skip to contentSkip to conversation

Revert "kms_content_protection: Set CP prop to UNDESIRED at igt exit."

PATCH In review Ramalingam C 3 participants 3 messages Sep 26, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "kms_content_protection: Set CP prop to UNDESIRED at igt exit."

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.

---
 tests/kms_content_protection.c | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)
tests/kms_content_protection.c +1 -23
index fce4b5910af4..e676b60bf719 100644
@@ -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);
-	}
 }
Signature · 6 lines
2.20.1

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Acked-by on v1 1/1
#1 lore raw

Quoting Ramalingam C (2019-09-26 09:48:08)

Quoted 7 lines

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.

-Chris
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

#2 lore raw

[igt-dev] ✗ Fi.CI.BAT: failure for Revert "kms_content_protection: Set CP prop to UNDESIRED at igt exit."

In reply to Ramalingam C
== Series Details ==

== Series Details ==

Series: Revert "kms_content_protection: Set CP prop to UNDESIRED at igt exit."
URL : https://patchwork.freedesktop.org/series/67270/
State : failure

== Summary ==

Series 67270 revision 1 was fully merged or fully failed: no git log

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev