[igt-dev] [PATCH i-g-t] tests/kms_content_protection: Avoid dmesg fallout

[Daniel Vetter]

Subsequent tests have become really unhappy. Paper over this for now.

If this doesn't work, then I think we need to revert.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108550
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108549
Cc: Ramalingam C <ramalingam.c at intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
---
 tests/kms_content_protection.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
index 47acbeedaa12..a79b36f8aa2c 100644
--- a/tests/kms_content_protection.c
+++ b/tests/kms_content_protection.c
@@ -170,9 +170,12 @@ test_cp_enable_disable(const enum pipe pipe, igt_output_t *output,
 			igt_debug("Retry (%d/2) ...\n", 3 - retry);
 	} while (retry && !ret);
 
+	/* FIXME: Kernel totally falls over if we leave HDCP enabled. Work
+	 * around this for now by restoring it before check whether it worked. */
+	igt_output_set_prop_value(output, IGT_CONNECTOR_CONTENT_PROTECTION, 0);
+
 	igt_assert_f(ret, "Content Protection not enabled\n");
 
-	igt_output_set_prop_value(output, IGT_CONNECTOR_CONTENT_PROTECTION, 0);
 	igt_plane_set_fb(primary, &red);
 	igt_display_commit2(display, s);
 
-- 
2.19.1