Skip to content

Commit e567857

Browse files
surajk8jlahtine-intel
authored andcommitted
drm/i915/hdcp: Extract hdcp structure from correct connector
Currently intel_hdcp is not being extracted from primary connector this patch fixes that. Fixes: 524240b ("drm/i915/hdcp: Propagate aux info in DP HDCP functions") Signed-off-by: Suraj Kandpal <[email protected]> Reviewed-by: Ankit Nautiyal <[email protected]> Signed-off-by: Ankit Nautiyal <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit 909fff3) Signed-off-by: Joonas Lahtinen <[email protected]>
1 parent 20dfa63 commit e567857

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,9 @@ intel_dp_hdcp2_wait_for_msg(struct intel_connector *connector,
389389
const struct hdcp2_dp_msg_data *hdcp2_msg_data)
390390
{
391391
struct drm_i915_private *i915 = to_i915(connector->base.dev);
392-
struct intel_hdcp *hdcp = &connector->hdcp;
392+
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
393+
struct intel_dp *dp = &dig_port->dp;
394+
struct intel_hdcp *hdcp = &dp->attached_connector->hdcp;
393395
u8 msg_id = hdcp2_msg_data->msg_id;
394396
int ret, timeout;
395397
bool msg_ready = false;
@@ -505,8 +507,9 @@ int intel_dp_hdcp2_read_msg(struct intel_connector *connector,
505507
{
506508
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
507509
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
508-
struct intel_hdcp *hdcp = &connector->hdcp;
509510
struct drm_dp_aux *aux = &dig_port->dp.aux;
511+
struct intel_dp *dp = &dig_port->dp;
512+
struct intel_hdcp *hdcp = &dp->attached_connector->hdcp;
510513
unsigned int offset;
511514
u8 *byte = buf;
512515
ssize_t ret, bytes_to_recv, len;

0 commit comments

Comments
 (0)