[Intel-gfx] [PATCH v2] drm/i915: Restore HDCP DRM_INFO when with no downstream

[Sean Paul]

On Tue, Jan 30, 2018 at 09:29:34AM -0500, 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.
> 
> 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 <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
> Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> Signed-off-by: Sean Paul <seanpaul at chromium.org>

Applied to the topic branch

> ---
>  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..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;
>  }
>  
> -- 
> 2.16.0.rc1.238.g530d649a79-goog
> 

-- 
Sean Paul, Software Engineer, Google / Chromium OS