Commit 909fff3e authored by Suraj Kandpal's avatar Suraj Kandpal Committed by Ankit Nautiyal
Browse files

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



Currently intel_hdcp is not being extracted from primary connector
this patch fixes that.

Fixes: 524240b2 ("drm/i915/hdcp: Propagate aux info in DP HDCP functions")
Signed-off-by: default avatarSuraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: default avatarAnkit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: default avatarAnkit Nautiyal <ankit.k.nautiyal@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240226063051.1685326-3-suraj.kandpal@intel.com
parent 429ccbd1

drivers/gpu/drm/i915/display/intel_dp_hdcp.c

+5 −2
Original line number Diff line number Diff line
@@ -395,7 +395,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;
@@ -511,8 +513,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;