Move (num_hdcp_streams > 0) condition to stream_encryption() code block, where it actually belongs. Cc: Ramalingam C <ramalingam.c@xxxxxxxxx> Signed-off-by: Anshuman Gupta <anshuman.gupta@xxxxxxxxx> --- drivers/gpu/drm/i915/display/intel_hdcp.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index f24e2c07bfa6..3cc128787887 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -878,15 +878,15 @@ static int _intel_hdcp_disable(struct intel_connector *connector) } drm_dbg_kms(&dev_priv->drm, "HDCP 1.4 transcoder: %s stream encryption disabled\n", transcoder_name(hdcp->stream_transcoder)); + /* + * If there are other connectors on this port using HDCP, + * don't disable it until it disabled HDCP encryption for + * all connectors in MST topology. + */ + if (dig_port->num_hdcp_streams > 0) + return ret; } - /* - * If there are other connectors on this port using HDCP, don't disable it - * until it disabled HDCP encryption for all connectors in MST topology. - */ - if (dig_port->num_hdcp_streams > 0) - return ret; - hdcp->hdcp_encrypted = false; intel_de_write(dev_priv, HDCP_CONF(dev_priv, cpu_transcoder, port), 0); if (intel_de_wait_for_clear(dev_priv, @@ -1947,10 +1947,10 @@ static int _intel_hdcp2_disable(struct intel_connector *connector) } drm_dbg_kms(&i915->drm, "HDCP 2.2 transcoder: %s stream encryption disabled\n", transcoder_name(hdcp->stream_transcoder)); - } - if (dig_port->num_hdcp_streams > 0) - return ret; + if (dig_port->num_hdcp_streams > 0) + return ret; + } ret = hdcp2_disable_encryption(connector); -- 2.26.2 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
