Patch "drm/i915/hdcp: Extract hdcp structure from correct connector" has been added to the 6.7-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    drm/i915/hdcp: Extract hdcp structure from correct connector

to the 6.7-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-i915-hdcp-extract-hdcp-structure-from-correct-co.patch
and it can be found in the queue-6.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit d01e16ee31a35088e981c23fb721cd72c2e928af
Author: Suraj Kandpal <suraj.kandpal@xxxxxxxxx>
Date:   Mon Feb 26 12:00:48 2024 +0530

    drm/i915/hdcp: Extract hdcp structure from correct connector
    
    [ Upstream commit e567857cb41c4c4f5bb33fd0ff3c282c5c3c4577 ]
    
    Currently intel_hdcp is not being extracted from primary connector
    this patch fixes that.
    
    Fixes: 524240b231ea ("drm/i915/hdcp: Propagate aux info in DP HDCP functions")
    Signed-off-by: Suraj Kandpal <suraj.kandpal@xxxxxxxxx>
    Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@xxxxxxxxx>
    Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@xxxxxxxxx>
    Link: https://patchwork.freedesktop.org/patch/msgid/20240226063051.1685326-3-suraj.kandpal@xxxxxxxxx
    (cherry picked from commit 909fff3e46c08eb6fcbb52e7a49dfb359007ae79)
    Signed-off-by: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
index a2c075b76728a..8538d1ce2fcb8 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
@@ -389,7 +389,9 @@ intel_dp_hdcp2_wait_for_msg(struct intel_connector *connector,
 			    const struct hdcp2_dp_msg_data *hdcp2_msg_data)
 {
 	struct drm_i915_private *i915 = to_i915(connector->base.dev);
-	struct intel_hdcp *hdcp = &connector->hdcp;
+	struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
+	struct intel_dp *dp = &dig_port->dp;
+	struct intel_hdcp *hdcp = &dp->attached_connector->hdcp;
 	u8 msg_id = hdcp2_msg_data->msg_id;
 	int ret, timeout;
 	bool msg_ready = false;
@@ -505,8 +507,9 @@ int intel_dp_hdcp2_read_msg(struct intel_connector *connector,
 {
 	struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
 	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
-	struct intel_hdcp *hdcp = &connector->hdcp;
 	struct drm_dp_aux *aux = &dig_port->dp.aux;
+	struct intel_dp *dp = &dig_port->dp;
+	struct intel_hdcp *hdcp = &dp->attached_connector->hdcp;
 	unsigned int offset;
 	u8 *byte = buf;
 	ssize_t ret, bytes_to_recv, len;