Skip to content

Commit 5d41eeb

Browse files
surajk8jlahtine-intel
authored andcommitted
drm/i915/hdcp: Use correct cp_irq_count
We are checking cp_irq_count from the wrong hdcp structure which ends up giving timed out errors. We only increment the cp_irq_count of the primary connector's hdcp structure but here in case of multidisplay setup we end up checking the secondary connector's hdcp structure, which will not have its cp_irq_count incremented. This leads to a timed out at CP_IRQ error even though a CP_IRQ was raised. Extract it from the correct intel_hdcp structure. --v2 -Explain why it was the wrong hdcp structure [Jani] Fixes: 8c9e4f6 ("drm/i915/hdcp: Use per-device debugs") Signed-off-by: Suraj Kandpal <[email protected]> Reviewed-by: Ankit Nautiyal <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit dd92590) Signed-off-by: Joonas Lahtinen <[email protected]>
1 parent 47ac09b commit 5d41eeb

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)