Skip to content

Commit b069f63

Browse files
committed
Merge tag 'drm-intel-fixes-2024-08-22' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-fixes
- Fix for HDCP timeouts Signed-off-by: Dave Airlie <[email protected]> From: Joonas Lahtinen <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 424a98a + 5d41eeb commit b069f63

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ static u32 transcoder_to_stream_enc_status(enum transcoder cpu_transcoder)
3939
static void intel_dp_hdcp_wait_for_cp_irq(struct intel_connector *connector,
4040
int timeout)
4141
{
42-
struct intel_hdcp *hdcp = &connector->hdcp;
42+
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
43+
struct intel_dp *dp = &dig_port->dp;
44+
struct intel_hdcp *hdcp = &dp->attached_connector->hdcp;
4345
long ret;
4446

4547
#define C (hdcp->cp_irq_count_cached != atomic_read(&hdcp->cp_irq_count))

0 commit comments

Comments
 (0)