summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2018-10-26 16:13:39 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2018-10-29 14:21:13 +0100
commit1270ec553741ac20c45178d2b26f9a9562ea565f (patch)
treeefca06fd39c51af0855e9985afd3547d0c413e51 /tests
parentaf57164fcb16950187ad402ed31f565e88c42a78 (diff)
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 <ramalingam.c@intel.com> Reviewed-by: Ramalingam C <ramalingam.c@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/kms_content_protection.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
index 1e7d2b9e4..801eff66c 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);