drm/i915: Nuke the intermediate pipe fault bitmasks

GEN8_DE_PIPE_IRQ_FAULT_ERRORS & co. don't really achieve anything.
Get rid of them and just declare all the bits directly in
gen8_de_pipe_fault_mask().

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240605111832.21373-6-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@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 82e1369e5d76b08b230e4aa134c2b41829908584..2b1aaf5c715bd65a5f03f12613bb77b9a8be794a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
@@ -837,13 +837,31 @@ static u32 gen8_de_port_aux_mask(struct drm_i915_private *dev_priv)
 static u32 gen8_de_pipe_fault_mask(struct drm_i915_private *dev_priv)
 {
        if (DISPLAY_VER(dev_priv) >= 13 || HAS_D12_PLANE_MINIMIZATION(dev_priv))
-               return RKL_DE_PIPE_IRQ_FAULT_ERRORS;
+               return GEN9_PIPE_CURSOR_FAULT |
+                       GEN11_PIPE_PLANE5_FAULT |
+                       GEN9_PIPE_PLANE4_FAULT |
+                       GEN9_PIPE_PLANE3_FAULT |
+                       GEN9_PIPE_PLANE2_FAULT |
+                       GEN9_PIPE_PLANE1_FAULT;
        else if (DISPLAY_VER(dev_priv) >= 11)
-               return GEN11_DE_PIPE_IRQ_FAULT_ERRORS;
+               return GEN9_PIPE_CURSOR_FAULT |
+                       GEN11_PIPE_PLANE7_FAULT |
+                       GEN11_PIPE_PLANE6_FAULT |
+                       GEN11_PIPE_PLANE5_FAULT |
+                       GEN9_PIPE_PLANE4_FAULT |
+                       GEN9_PIPE_PLANE3_FAULT |
+                       GEN9_PIPE_PLANE2_FAULT |
+                       GEN9_PIPE_PLANE1_FAULT;
        else if (DISPLAY_VER(dev_priv) >= 9)
-               return GEN9_DE_PIPE_IRQ_FAULT_ERRORS;
+               return GEN9_PIPE_CURSOR_FAULT |
+                       GEN9_PIPE_PLANE4_FAULT |
+                       GEN9_PIPE_PLANE3_FAULT |
+                       GEN9_PIPE_PLANE2_FAULT |
+                       GEN9_PIPE_PLANE1_FAULT;
        else
-               return GEN8_DE_PIPE_IRQ_FAULT_ERRORS;
+               return GEN8_PIPE_CURSOR_FAULT |
+                       GEN8_PIPE_SPRITE_FAULT |
+                       GEN8_PIPE_PRIMARY_FAULT;
 }
 
 static void intel_pmdemand_irq_handler(struct drm_i915_private *dev_priv)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 2bb1c268b4751b7982d731e2d6e704bb06efcd4a..6b4ab3ccc3e068722fa0dd90c87a3035b3c773c9 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -2530,24 +2530,6 @@
 #define  GEN8_PIPE_SCAN_LINE_EVENT     REG_BIT(2)
 #define  GEN8_PIPE_VSYNC               REG_BIT(1)
 #define  GEN8_PIPE_VBLANK              REG_BIT(0)
-#define GEN8_DE_PIPE_IRQ_FAULT_ERRORS \
-       (GEN8_PIPE_CURSOR_FAULT | \
-        GEN8_PIPE_SPRITE_FAULT | \
-        GEN8_PIPE_PRIMARY_FAULT)
-#define GEN9_DE_PIPE_IRQ_FAULT_ERRORS \
-       (GEN9_PIPE_CURSOR_FAULT | \
-        GEN9_PIPE_PLANE4_FAULT | \
-        GEN9_PIPE_PLANE3_FAULT | \
-        GEN9_PIPE_PLANE2_FAULT | \
-        GEN9_PIPE_PLANE1_FAULT)
-#define GEN11_DE_PIPE_IRQ_FAULT_ERRORS \
-       (GEN9_DE_PIPE_IRQ_FAULT_ERRORS | \
-        GEN11_PIPE_PLANE7_FAULT | \
-        GEN11_PIPE_PLANE6_FAULT | \
-        GEN11_PIPE_PLANE5_FAULT)
-#define RKL_DE_PIPE_IRQ_FAULT_ERRORS \
-       (GEN9_DE_PIPE_IRQ_FAULT_ERRORS | \
-        GEN11_PIPE_PLANE5_FAULT)
 
 #define _HPD_PIN_DDI(hpd_pin)  ((hpd_pin) - HPD_PORT_A)
 #define _HPD_PIN_TC(hpd_pin)   ((hpd_pin) - HPD_PORT_TC1)