It is already merged to drm-intel-next https://cgit.freedesktop.org/drm/drm-intel/commit/?h=drm-intel-next&id=40a6cead28f841ac350bd38dd7260ecacd5eab03 > -----Original Message----- > From: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx> > Sent: Friday, January 22, 2021 8:51 PM > To: Colin King <colin.king@xxxxxxxxxxxxx>; Joonas Lahtinen > <joonas.lahtinen@xxxxxxxxxxxxxxx>; Vivi, Rodrigo <rodrigo.vivi@xxxxxxxxx>; > David Airlie <airlied@xxxxxxxx>; Daniel Vetter <daniel@xxxxxxxx>; C, Ramalingam > <ramalingam.c@xxxxxxxxx>; Gupta, Anshuman <anshuman.gupta@xxxxxxxxx>; > Shankar, Uma <uma.shankar@xxxxxxxxx>; intel-gfx@xxxxxxxxxxxxxxxxxxxxx; dri- > devel@xxxxxxxxxxxxxxxxxxxxx > Cc: kernel-janitors@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx > Subject: Re: [PATCH][next] drm/i915/hdcp: Fix return of value in uninitialized > variable ret > > On Fri, 22 Jan 2021, Colin King <colin.king@xxxxxxxxxxxxx> wrote: > > From: Colin Ian King <colin.king@xxxxxxxxxxxxx> > > > > Currently when there are other connectors on the port using HDCP the > > function _intel_hdcp_disable returns a garbage uninitialized value in > > variable ret. I believe the intention is to return 0, so return this > > literal value instead of the value in ret. > > > > Addresses-Coverity: ("Uninitialized scalar return") > > Fixes: 899c8762f981 ("drm/i915/hdcp: Configure HDCP2.2 MST steram > > encryption status") > > Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx> > > Thanks, but there's already a fix in progress: > > http://lore.kernel.org/r/20210119064655.1605-3-anshuman.gupta@xxxxxxxxx > > BR, > Jani. > > > > --- > > drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c > > b/drivers/gpu/drm/i915/display/intel_hdcp.c > > index db8dff2eeb0a..a0e7b0bf892b 100644 > > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > > @@ -883,7 +883,7 @@ static int _intel_hdcp_disable(struct intel_connector > *connector) > > * until it disabled HDCP encryption for all connectors in MST topology. > > */ > > if (dig_port->num_hdcp_streams > 0) > > - return ret; > > + return 0; > > > > hdcp->hdcp_encrypted = false; > > intel_de_write(dev_priv, HDCP_CONF(dev_priv, cpu_transcoder, port), > > 0); > > -- > Jani Nikula, Intel Open Source Graphics Center
