On Fri, 15 Jan 2021, Chris Wilson <[email protected]> wrote: > drivers/gpu/drm/i915/display/intel_hdcp.c:886 _intel_hdcp_disable() error: > uninitialized symbol 'ret'. > drivers/gpu/drm/i915/display/intel_hdcp.c:1951 _intel_hdcp2_disable() error: > uninitialized symbol 'ret'. > > Given the comment that this error reflects the status of all connectors > within this MST topology, I opted to use -EBUSY to indicate not all were > ready. > > Fixes: 2a743b7b8a8b ("drm/i915/hdcp: Configure HDCP1.4 MST steram encryption > status") > Fixes: 899c8762f981 ("drm/i915/hdcp: Configure HDCP2.2 MST steram encryption > status") > Signed-off-by: Chris Wilson <[email protected]> > Cc: Ramalingam C <[email protected]> > Cc: Uma Shankar <[email protected]> > Cc: Anshuman Gupta <[email protected]> > Cc: Sean Paul <[email protected]> > Cc: Jani Nikula <[email protected]>
Reviewed-by: Jani Nikula <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_hdcp.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c > b/drivers/gpu/drm/i915/display/intel_hdcp.c > index db8dff2eeb0a..2be4822b91a0 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 -EBUSY; > > hdcp->hdcp_encrypted = false; > intel_de_write(dev_priv, HDCP_CONF(dev_priv, cpu_transcoder, port), 0); > @@ -1948,7 +1948,7 @@ static int _intel_hdcp2_disable(struct intel_connector > *connector) > } > > if (dig_port->num_hdcp_streams > 0) > - return ret; > + return -EBUSY; > > ret = hdcp2_disable_encryption(connector); -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
