diff options
| author |   Dave Airlie <airlied@redhat.com> | 2024-08-23 09:05:11 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-08-23 09:05:12 +1000 |
| commit | b069f6315c2d99b32cb0e1adca7ab4d99bccf410 (patch) | |
| tree | c99c96ddaa0b1c69fa7ecbfb306a76e9114e0b2b | |
| parent | Merge tag 'amd-drm-fixes-6.11-2024-08-21' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes (diff) | |
| parent | drm/i915/hdcp: Use correct cp_irq_count (diff) | |
| download | wireguard-linux-b069f6315c2d99b32cb0e1adca7ab4d99bccf410.tar.xz wireguard-linux-b069f6315c2d99b32cb0e1adca7ab4d99bccf410.zip | |
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 <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZsbPMm6XfzimmZW0@jlahtine-mobl.ger.corp.intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c index 2edffe62f360..b0101d72b9c1 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c @@ -39,7 +39,9 @@ static u32 transcoder_to_stream_enc_status(enum transcoder cpu_transcoder) static void intel_dp_hdcp_wait_for_cp_irq(struct intel_connector *connector, int timeout) { - 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; long ret; #define C (hdcp->cp_irq_count_cached != atomic_read(&hdcp->cp_irq_count)) |