public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
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: Avoid dmesg fallout
Date: Thu, 25 Oct 2018 13:36:20 +0200	[thread overview]
Message-ID: <20181025113620.768-1-daniel.vetter@ffwll.ch> (raw)

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@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@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

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

             reply	other threads:[~2018-10-25 11:36 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-25 11:36 Daniel Vetter [this message]
2018-10-25 11:58 ` [igt-dev] ✗ Fi.CI.BAT: failure for tests/kms_content_protection: Avoid dmesg fallout Patchwork
2018-10-25 13:10 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork
2018-10-25 13:49 ` [igt-dev] [PATCH i-g-t] " C, Ramalingam
2018-10-25 14:08 ` C, Ramalingam
2018-10-25 18:38   ` Daniel Vetter
2018-10-25 14:28 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2018-10-25 15:55 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2018-10-25 17:18 ` Patchwork

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=20181025113620.768-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