[Intel-gfx] [PATCH 1/2] drm/i915/hdcp: Fix WARN_ON(data->k > INTEL_NUM_PIPES)

[Jani Nikula]

On Fri, 15 Jan 2021, Anshuman Gupta <anshuman.gupta at intel.com> wrote:
> Initialize no. of streams transmitted on a port to zero
> such that intel_hdcp_required_content_stream() can
> prepared the content stream after subsequemt attmept to
> enable hdcp after a HDCP failure.
>
> 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 | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index db8dff2eeb0a..f24e2c07bfa6 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -55,6 +55,8 @@ intel_hdcp_required_content_stream(struct intel_digital_port *dig_port)
>  
>  	if (dig_port->hdcp_auth_status)
>  		return 0;
> +	else
> +		data->k = 0;
>  

If you have an early return, the else branch is unnecessary; just do it
at the top level like everything after it.

BR,
Jani.

>  	drm_connector_list_iter_begin(&i915->drm, &conn_iter);
>  	for_each_intel_connector_iter(connector, &conn_iter) {

-- 
Jani Nikula, Intel Open Source Graphics Center