[Intel-gfx] [PATCH v2 3/3] drm/i915/hdcp: return correct error code

[Nautiyal, Ankit K]

Looks good to me.

Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal at intel.com>

On 3/4/2021 2:26 PM, Anshuman Gupta wrote:
> hdcp2_enable_stream_encryption shouldn't get called in case
> of any port authentication or encryption error, though
> hdcp2_enable_stream_encryption checks for link encryption
> before enabling stream encryption and returns error but
> this return error code won't be correct in case of any error
> due to port authentication and encryption.
>
> Cc: Ramalingam C <ramalingam.c at intel.com>
> Signed-off-by: Anshuman Gupta <anshuman.gupta at intel.com>
> ---
>   drivers/gpu/drm/i915/display/intel_hdcp.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index 9a70c164c377..21d6c73784b3 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -1896,7 +1896,8 @@ static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector)
>   		}
>   	}
>   
> -	ret = hdcp2_enable_stream_encryption(connector);
> +	if (!ret)
> +		ret = hdcp2_enable_stream_encryption(connector);
>   
>   	return ret;
>   }