From 1270ec553741ac20c45178d2b26f9a9562ea565f Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Fri, 26 Oct 2018 16:13:39 +0200 Subject: tests/kms_content_protection: restore for real before failing Nothing happens if you don't commit ... v2: rebased!? Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108550 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108549 Cc: Ramalingam C Reviewed-by: Ramalingam C Signed-off-by: Daniel Vetter --- 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 1e7d2b9e..801eff66 100644 --- a/tests/kms_content_protection.c +++ b/tests/kms_content_protection.c @@ -175,12 +175,11 @@ test_cp_enable_disable(const enum pipe pipe, igt_output_t *output, * "content protection" at "UNDESIRED". */ 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); -- cgit v1.2.3