[igt-dev] [PATCH i-g-t] tests/kms_content_protection: restore for real before failing

[Daniel Vetter]

On Mon, Oct 29, 2018 at 09:52:04AM +0100, Daniel Vetter wrote:
> Nothing happens if you don't commit ...
> 
> v2: rebased!?

Seems to have worked now, I guess I had a stored conflict resolution
locally that I wasnted aware of. Applied.
-Daniel

> 
> 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 at intel.com>
> Reviewed-by: Ramalingam C <ramalingam.c at intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at 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 1e7d2b9e4e69..801eff66c272 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);
>  
> -- 
> 2.19.1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch