[igt-dev] [PATCH i-g-t] tests/kms_content_protection: restore for real before failing

Daniel Vetter
2018-10-26T14:14:54Z

Nothing happens if you don't commit ...

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@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
tests/kms_content_protection.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
index 87c7a9abd38a..060a00f95d04 100644
--- a/tests/kms_content_protection.c
+++ b/tests/kms_content_protection.c
@@ -174,12 +174,11 @@ test_cp_enable_disable(const enum pipe pipe, igt_output_t *output,
/* 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_plane_set_fb(primary, &red);
igt_display_commit2(display, s);

+ igt_assert_f(ret, "Content Protection not enabled\n");
+
/* Wait for HDCP to be disabled, before crtc off */
wait_for_prop_value(output, 0, 1000);

--
2.19.1