drm/i915: remove explicit CNL handling from i915_irq.c

Remove special handling of PORT_F in i915_irq.c and only do it for
DISPLAY_VER == 11.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210728215946.1573015-17-lucas.demarchi@intel.com

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 2e1774e484996669aa35ff0c138618b0e42dd85f..1b9ee92b6ee7d8e38265f176a55a2d1160428394 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2297,11 +2297,10 @@ static u32 gen8_de_port_aux_mask(struct drm_i915_private *dev_priv)
                        GEN9_AUX_CHANNEL_C |
                        GEN9_AUX_CHANNEL_D;
 
-       if (IS_CNL_WITH_PORT_F(dev_priv) || DISPLAY_VER(dev_priv) == 11)
-               mask |= CNL_AUX_CHANNEL_F;
-
-       if (DISPLAY_VER(dev_priv) == 11)
+       if (DISPLAY_VER(dev_priv) == 11) {
+               mask |= ICL_AUX_CHANNEL_F;
                mask |= ICL_AUX_CHANNEL_E;
+       }
 
        return mask;
 }

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 010966cc008e0063a2652b2fd3d748ec80bd98d4..cb757a2acd386f9dfb1f2a2e75ab7d6b4842066c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -8001,7 +8001,7 @@ enum {
 #define  DSI1_NON_TE                   (1 << 31)
 #define  DSI0_NON_TE                   (1 << 30)
 #define  ICL_AUX_CHANNEL_E             (1 << 29)
-#define  CNL_AUX_CHANNEL_F             (1 << 28)
+#define  ICL_AUX_CHANNEL_F             (1 << 28)
 #define  GEN9_AUX_CHANNEL_D            (1 << 27)
 #define  GEN9_AUX_CHANNEL_C            (1 << 26)
 #define  GEN9_AUX_CHANNEL_B            (1 << 25)