[PATCH] drm/i915: Restore HDCP DRM_INFO when with no downstream

Ramalingam C ramalingam.c at intel.com
Tue Jan 30 09:24:49 UTC 2018



On Monday 22 January 2018 11:25 PM, Sean Paul wrote:
> 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.
>
> Fixes: 87eb3ec818fa ("drm/i915: II stage HDCP auth for repeater only")
> Cc: Ramalingam C <ramalingam.c at intel.com>
> Cc: Sean Paul <seanpaul at chromium.org>
> Cc: Jani Nikula <jani.nikula at linux.intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Cc: intel-gfx at lists.freedesktop.org
> Signed-off-by: Sean Paul <seanpaul at chromium.org>
> ---
>   drivers/gpu/drm/i915/intel_hdcp.c | 5 ++---
>   1 file 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..dd7dffd405d5 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 downstream devices)\n");
Movement of the message make sense.

This log is for HDCP enabled on receiver. Even repeater might be with no 
downstream devices.
So msg such as "HDCP enabled on Receiver" would be more informative.

--Ram
>   	return 0;
>   }
>   



More information about the dri-devel mailing list