Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915/dp: Return early if getting/ackink link service IRQs fails
If getting/acking the link service IRQs fail, the short HPD handler
should bail out, falling back to a full connector detection as in case
of any AUX access failures during the HPD handling. Do this by
separating the getting/acking and handling steps of the IRQs.
Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patch.msgid.link/20260225164618.1261368-15-imre.deak@intel.com
+29
-16
+29
-16
drivers/gpu/drm/i915/display/intel_dp.c
+29
-16
drivers/gpu/drm/i915/display/intel_dp.c
···
5824
5824
drm_dbg_kms(display->drm, "Sink specific irq unhandled\n");
5825
5825
}
5826
5826
5827
-
/*
5828
-
* Return %true if a full connector reprobe is required due to a failure while
5829
-
* reading or acking the link service IRQs or if the reprobing is required
5830
-
* after handling a link service IRQ event.
5831
-
*/
5832
-
static bool intel_dp_check_link_service_irq(struct intel_dp *intel_dp)
5827
+
/* Return %true if reading and acking the link service IRQs succeeded. */
5828
+
static bool intel_dp_get_and_ack_link_service_irq(struct intel_dp *intel_dp, u8 *irq_mask)
5833
5829
{
5834
-
struct intel_display *display = to_intel_display(intel_dp);
5835
-
bool reprobe_needed = false;
5836
5830
u8 val;
5837
5831
5832
+
*irq_mask = 0;
5833
+
5838
5834
if (intel_dp->dpcd[DP_DPCD_REV] < DP_DPCD_REV_12)
5839
-
return false;
5835
+
return true;
5840
5836
5841
5837
if (drm_dp_dpcd_readb(&intel_dp->aux,
5842
5838
DP_LINK_SERVICE_IRQ_VECTOR_ESI0, &val) != 1)
5843
-
return true;
5839
+
return false;
5844
5840
5845
5841
if (!val)
5846
-
return false;
5842
+
return true;
5847
5843
5848
5844
if (drm_dp_dpcd_writeb(&intel_dp->aux,
5849
5845
DP_LINK_SERVICE_IRQ_VECTOR_ESI0, val) != 1)
5850
-
return true;
5846
+
return false;
5851
5847
5852
-
if (val & RX_CAP_CHANGED)
5848
+
*irq_mask = val;
5849
+
5850
+
return true;
5851
+
}
5852
+
5853
+
/*
5854
+
* Return %true if a full connector reprobe is required after handling a link
5855
+
* service IRQ event.
5856
+
*/
5857
+
static bool intel_dp_handle_link_service_irq(struct intel_dp *intel_dp, u8 irq_mask)
5858
+
{
5859
+
struct intel_display *display = to_intel_display(intel_dp);
5860
+
bool reprobe_needed = false;
5861
+
5862
+
if (irq_mask & RX_CAP_CHANGED)
5853
5863
reprobe_needed = true;
5854
5864
5855
-
if (val & HDMI_LINK_STATUS_CHANGED)
5865
+
if (irq_mask & HDMI_LINK_STATUS_CHANGED)
5856
5866
intel_dp_handle_hdmi_link_status_change(intel_dp);
5857
5867
5858
-
if ((val & DP_TUNNELING_IRQ) &&
5868
+
if ((irq_mask & DP_TUNNELING_IRQ) &&
5859
5869
drm_dp_tunnel_handle_irq(display->dp_tunnel_mgr,
5860
5870
&intel_dp->aux))
5861
5871
reprobe_needed = true;
···
5910
5900
5911
5901
intel_dp_handle_device_service_irq(intel_dp, irq_mask);
5912
5902
5913
-
if (intel_dp_check_link_service_irq(intel_dp))
5903
+
if (!intel_dp_get_and_ack_link_service_irq(intel_dp, &irq_mask))
5904
+
return false;
5905
+
5906
+
if (intel_dp_handle_link_service_irq(intel_dp, irq_mask))
5914
5907
reprobe_needed = true;
5915
5908
5916
5909
/* Handle CEC interrupts, if any */