From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: IGT development <igt-dev@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Subject: [igt-dev] [PATCH i-g-t] tests/kms_content_protection: restore for real before failing
Date: Fri, 26 Oct 2018 16:14:43 +0200 [thread overview]
Message-ID: <20181026141443.17173-1-daniel.vetter@ffwll.ch> (raw)
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
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next reply other threads:[~2018-10-26 14:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-26 14:14 Daniel Vetter [this message]
2018-10-26 14:40 ` [igt-dev] ✗ Fi.CI.BAT: failure for tests/kms_content_protection: restore for real before failing Patchwork
2018-10-29 6:49 ` [igt-dev] [PATCH i-g-t] " C, Ramalingam
2018-10-29 8:39 ` [igt-dev] ✗ Fi.CI.BAT: failure for " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2018-10-29 8:52 [igt-dev] [PATCH i-g-t] " Daniel Vetter
2018-10-29 13:22 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181026141443.17173-1-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox