aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Paul <[email protected]>2018-01-30 09:29:34 -0500
committerSean Paul <[email protected]>2018-01-30 10:54:51 -0500
commitbb68922f100e78982515e7593de9fd23b58172d8 (patch)
treef6b0ca1ebfa318ce88f5cf292ad247a360454798
parent49d85d034268ab9d9156ff6f81cc07d4caad03f6 (diff)
drm/i915: Restore HDCP DRM_INFO when with no downstream
The commit below returned earlier than before, but failed to move the info message when authenticating without downstream devices. This patch restores the message on authentication success. Changes in v2: - s/no downstream devices/no repeater present/ (Ram) Fixes: 87eb3ec818fa ("drm/i915: II stage HDCP auth for repeater only") Cc: Ramalingam C <[email protected]> Cc: Sean Paul <[email protected]> Cc: Jani Nikula <[email protected]> Cc: Joonas Lahtinen <[email protected]> Cc: Rodrigo Vivi <[email protected]> Cc: [email protected] Reviewed-by: Daniel Vetter <[email protected]> Signed-off-by: Sean Paul <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
-rw-r--r--drivers/gpu/drm/i915/intel_hdcp.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
index db9527173a1e..9fc9da030514 100644
--- a/drivers/gpu/drm/i915/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/intel_hdcp.c
@@ -168,10 +168,8 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port,
/* If there are no downstream devices, we're all done. */
num_downstream = DRM_HDCP_NUM_DOWNSTREAM(bstatus[0]);
- if (num_downstream == 0) {
- DRM_INFO("HDCP is enabled (no downstream devices)\n");
+ if (num_downstream == 0)
return 0;
- }
ksv_fifo = kzalloc(num_downstream * DRM_HDCP_KSV_LEN, GFP_KERNEL);
if (!ksv_fifo)
@@ -502,6 +500,7 @@ static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port,
if (repeater_present)
return intel_hdcp_auth_downstream(intel_dig_port, shim);
+ DRM_INFO("HDCP is enabled (no repeater present)\n");
return 0;
}