From: Suraj Kandpal Date: Mon, 15 May 2023 10:32:23 +0000 (+0530) Subject: drm/i915/hdcp: Remove enforce_type0 check outside loop X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=415beb1fa63cf06e3b696822e94f977171921a2a;p=linux.git drm/i915/hdcp: Remove enforce_type0 check outside loop Remove enforce_type0 check outside the loop since it does not make sense to keep it there as we use the same digport and continue checking it again and again Cc: Ankit Nautiyal Signed-off-by: Suraj Kandpal Reviewed-by: Jani Nikula Signed-off-by: Animesh Manna Link: https://patchwork.freedesktop.org/patch/msgid/20230515103225.688830-3-suraj.kandpal@intel.com --- diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index bce0fa2e45a1a..73b7e7e62705b 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -84,6 +84,9 @@ intel_hdcp_required_content_stream(struct intel_digital_port *dig_port) if (dig_port->hdcp_auth_status) return 0; + if (!dig_port->hdcp_mst_type1_capable) + enforce_type0 = true; + drm_connector_list_iter_begin(&i915->drm, &conn_iter); for_each_intel_connector_iter(connector, &conn_iter) { if (connector->base.status == connector_status_disconnected) @@ -96,9 +99,6 @@ intel_hdcp_required_content_stream(struct intel_digital_port *dig_port) if (conn_dig_port != dig_port) continue; - if (!enforce_type0 && !dig_port->hdcp_mst_type1_capable) - enforce_type0 = true; - data->streams[data->k].stream_id = intel_conn_to_vcpi(connector); data->k++;