diff options
| author | Imre Deak <imre.deak@intel.com> | 2026-02-25 19:46:17 +0300 |
|---|---|---|
| committer | Imre Deak <imre.deak@intel.com> | 2026-03-03 18:49:10 +0300 |
| commit | 683853b166f051eba43088092d4d1d85cd8ac3cd (patch) | |
| tree | 4e60dbc8d0525dba5ed4c67f10b5f7dcc69a8543 | |
| parent | 0f3675d6472218fdde3e6682ab1ad59618a63e83 (diff) | |
| download | linux-683853b166f051eba43088092d4d1d85cd8ac3cd.tar.xz | |
drm/i915/dp: Ack only the handled device service IRQs
Only those IRQs should be acked that are handled, however for SST all
IRQs triggered by the sink are acked. This can be a problem for flags
that are reserved/reading zero at a given moment, but become used for
some purpose - with a side-effect if set - in a future DPCD revision.
Fix the above by acking only those device service IRQs that will be
handled. While at it add asserts that only the known/acked device
service IRQs are handled both in the MST and SST case.
Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patch.msgid.link/20260225164618.1261368-20-imre.deak@intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 413d6872812b..17439a415926 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -4929,6 +4929,14 @@ intel_dp_mst_disconnect(struct intel_dp *intel_dp) drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst.mgr, intel_dp->is_mst); } +#define INTEL_DP_DEVICE_SERVICE_IRQ_MASK_SST (DP_AUTOMATED_TEST_REQUEST | \ + DP_CP_IRQ | \ + DP_SINK_SPECIFIC_IRQ) + +#define INTEL_DP_DEVICE_SERVICE_IRQ_MASK_MST (DP_CP_IRQ | \ + DP_DOWN_REP_MSG_RDY | \ + DP_UP_REQ_MSG_RDY) + static bool intel_dp_get_sink_irq_esi(struct intel_dp *intel_dp, u8 *esi) { @@ -5026,6 +5034,8 @@ static bool intel_dp_get_and_ack_sink_irq_esi_sst(struct intel_dp *intel_dp, u8 encoder->base.base.id, encoder->base.name, esi); + esi[1] &= INTEL_DP_DEVICE_SERVICE_IRQ_MASK_SST; + if (mem_is_zero(&esi[1], 3)) return true; @@ -5570,6 +5580,8 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp) if (mem_is_zero(ack, sizeof(ack))) break; + drm_WARN_ON(display->drm, ack[1] & ~INTEL_DP_DEVICE_SERVICE_IRQ_MASK_MST); + if (!intel_dp_ack_sink_irq_esi(intel_dp, ack)) drm_dbg_kms(display->drm, "Failed to ack ESI\n"); @@ -5854,6 +5866,8 @@ static void intel_dp_handle_device_service_irq(struct intel_dp *intel_dp, u8 irq { struct intel_display *display = to_intel_display(intel_dp); + drm_WARN_ON(display->drm, irq_mask & ~INTEL_DP_DEVICE_SERVICE_IRQ_MASK_SST); + if (irq_mask & DP_AUTOMATED_TEST_REQUEST) intel_dp_test_request(intel_dp); |