From: Sean Paul Date: Tue, 30 Jan 2018 09:29:34 -0500 Subject: drm/i915: Restore HDCP DRM_INFO when with no downstream Git-commit: bb68922f100e78982515e7593de9fd23b58172d8 Patch-mainline: v4.17-rc1 References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166 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 Cc: Sean Paul Cc: Jani Nikula Cc: Joonas Lahtinen Cc: Rodrigo Vivi Cc: intel-gfx@lists.freedesktop.org Reviewed-by: Daniel Vetter Signed-off-by: Sean Paul Link: https://patchwork.freedesktop.org/patch/msgid/20180130142943.168314-1-seanpaul@chromium.org Link: https://patchwork.freedesktop.org/patch/msgid/20180130142943.168314-1-seanpaul@chromium.org Acked-by: Petr Tesarik --- drivers/gpu/drm/i915/intel_hdcp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- 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 in /* 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_ if (repeater_present) return intel_hdcp_auth_downstream(intel_dig_port, shim); + DRM_INFO("HDCP is enabled (no repeater present)\n"); return 0; }