drm/i915: Only disable HDCP when it's active
authorSean Paul <seanpaul@chromium.org>
Tue, 9 Jan 2018 18:53:13 +0000 (13:53 -0500)
committerSean Paul <seanpaul@chromium.org>
Tue, 9 Jan 2018 18:55:08 +0000 (13:55 -0500)
commit01468d6c711a31a9fe333d072afa8a4730ef3bf9
treeb378dff665def079311c600c6b12ac82817b4868
parent2f4498a4ac2f77671587faa99e38c3342d666114
drm/i915: Only disable HDCP when it's active

Instead of always trying to disable HDCP. Only run hdcp_disable when the
state is not UNDESIRED. This will catch cases where it's enabled and
also cases where enable failed and the state is left in DESIRED mode.

Note that things won't blow up if disable is attempted while already
disabled, it's just bad form.

Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20180109185330.16853-1-seanpaul@chromium.org
drivers/gpu/drm/i915/intel_hdcp.c