diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-10-25 13:36:20 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-10-25 20:37:50 +0200 |
| commit | 81b66cf2806d6a8e9516580fb31879677487d32b (patch) | |
| tree | 6bf522a2ae90e2d1de55e860dc7be32df5c0c806 /tests | |
| parent | ff8d1156723f235e82cb4fcfd2cd6e5a5bb211fa (diff) | |
tests/kms_content_protection: Avoid dmesg fallout
Subsequent tests have become really unhappy. Paper over this for now.
If this doesn't work, then I think we need to revert.
v2: Use Ram's suggestion for comment.
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.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c index 47acbeeda..1e7d2b9e4 100644 --- a/tests/kms_content_protection.c +++ b/tests/kms_content_protection.c @@ -170,9 +170,14 @@ test_cp_enable_disable(const enum pipe pipe, igt_output_t *output, igt_debug("Retry (%d/2) ...\n", 3 - retry); } while (retry && !ret); + /* + * Even on HDCP enable failed scenario, IGT should exit leaving the + * "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_output_set_prop_value(output, IGT_CONNECTOR_CONTENT_PROTECTION, 0); igt_plane_set_fb(primary, &red); igt_display_commit2(display, s); |