drm/i915/xe2lpd: Handle port AUX interrupts

Differently from previous version, Xe2_LPD groups all port AUX interrupt
bits into PICA interrupt registers.

While at it, drop some trailing newlines.

BSpec: 68958, 69697
Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230919192128.2045154-13-lucas.demarchi@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c
index 62ce5547555400ff58861111c860f83af2ee93f8..bff4a76310c0e991ebf9f47b78095d830e8fdb47 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
@@ -792,7 +792,9 @@ static u32 gen8_de_port_aux_mask(struct drm_i915_private *dev_priv)
 {
        u32 mask;
 
-       if (DISPLAY_VER(dev_priv) >= 14)
+       if (DISPLAY_VER(dev_priv) >= 20)
+               return 0;
+       else if (DISPLAY_VER(dev_priv) >= 14)
                return TGL_DE_PORT_AUX_DDIA |
                        TGL_DE_PORT_AUX_DDIB;
        else if (DISPLAY_VER(dev_priv) >= 13)

diff --git a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
index 95a7ea94f41743d715a64a4e119630d566c31714..3398cc21bd2682a5a3afbb087f83ceaeba78dbc2 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_hotplug_irq.c
@@ -514,6 +514,9 @@ void xelpdp_pica_irq_handler(struct drm_i915_private *i915, u32 iir)
        u32 trigger_aux = iir & XELPDP_AUX_TC_MASK;
        u32 pin_mask = 0, long_mask = 0;
 
+       if (DISPLAY_VER(i915) >= 20)
+               trigger_aux |= iir & XE2LPD_AUX_DDI_MASK;
+
        for (pin = HPD_PORT_TC1; pin <= HPD_PORT_TC4; pin++) {
                u32 val;
 

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index e00e4d569ba9c0950a3d44e82d98f9f9f5638784..467edc6f9e398990b9ea470a0246f765a570b0ee 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -4467,13 +4467,12 @@
 #define PICAINTERRUPT_IMR                      _MMIO(0x16FE54)
 #define PICAINTERRUPT_IIR                      _MMIO(0x16FE58)
 #define PICAINTERRUPT_IER                      _MMIO(0x16FE5C)
-
 #define  XELPDP_DP_ALT_HOTPLUG(hpd_pin)                REG_BIT(16 + _HPD_PIN_TC(hpd_pin))
 #define  XELPDP_DP_ALT_HOTPLUG_MASK            REG_GENMASK(19, 16)
-
 #define  XELPDP_AUX_TC(hpd_pin)                        REG_BIT(8 + _HPD_PIN_TC(hpd_pin))
 #define  XELPDP_AUX_TC_MASK                    REG_GENMASK(11, 8)
-
+#define  XE2LPD_AUX_DDI(hpd_pin)               REG_BIT(6 + _HPD_PIN_DDI(hpd_pin))
+#define  XE2LPD_AUX_DDI_MASK                   REG_GENMASK(7, 6)
 #define  XELPDP_TBT_HOTPLUG(hpd_pin)           REG_BIT(_HPD_PIN_TC(hpd_pin))
 #define  XELPDP_TBT_HOTPLUG_MASK               REG_GENMASK(3, 0)