drm/i915: Nuke the redundant TC/TBT HPD bit defines

We have nice parametrized GEN11_{TC,TBT}_HOTPLUG() so nuke
the overlapping defines.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200630215601.28557-7-ville.syrjala@linux.intel.com
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index f113fe4..81cfc72 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -132,19 +132,19 @@ static const u32 hpd_bxt[HPD_NUM_PINS] = {
 };
 
 static const u32 hpd_gen11[HPD_NUM_PINS] = {
-       [HPD_PORT_C] = GEN11_TC1_HOTPLUG | GEN11_TBT1_HOTPLUG,
-       [HPD_PORT_D] = GEN11_TC2_HOTPLUG | GEN11_TBT2_HOTPLUG,
-       [HPD_PORT_E] = GEN11_TC3_HOTPLUG | GEN11_TBT3_HOTPLUG,
-       [HPD_PORT_F] = GEN11_TC4_HOTPLUG | GEN11_TBT4_HOTPLUG,
+       [HPD_PORT_C] = GEN11_TC_HOTPLUG(PORT_TC1) | GEN11_TBT_HOTPLUG(PORT_TC1),
+       [HPD_PORT_D] = GEN11_TC_HOTPLUG(PORT_TC2) | GEN11_TBT_HOTPLUG(PORT_TC2),
+       [HPD_PORT_E] = GEN11_TC_HOTPLUG(PORT_TC3) | GEN11_TBT_HOTPLUG(PORT_TC3),
+       [HPD_PORT_F] = GEN11_TC_HOTPLUG(PORT_TC4) | GEN11_TBT_HOTPLUG(PORT_TC4),
 };
 
 static const u32 hpd_gen12[HPD_NUM_PINS] = {
-       [HPD_PORT_D] = GEN11_TC1_HOTPLUG | GEN11_TBT1_HOTPLUG,
-       [HPD_PORT_E] = GEN11_TC2_HOTPLUG | GEN11_TBT2_HOTPLUG,
-       [HPD_PORT_F] = GEN11_TC3_HOTPLUG | GEN11_TBT3_HOTPLUG,
-       [HPD_PORT_G] = GEN11_TC4_HOTPLUG | GEN11_TBT4_HOTPLUG,
-       [HPD_PORT_H] = GEN12_TC5_HOTPLUG | GEN12_TBT5_HOTPLUG,
-       [HPD_PORT_I] = GEN12_TC6_HOTPLUG | GEN12_TBT6_HOTPLUG,
+       [HPD_PORT_D] = GEN11_TC_HOTPLUG(PORT_TC1) | GEN11_TBT_HOTPLUG(PORT_TC1),
+       [HPD_PORT_E] = GEN11_TC_HOTPLUG(PORT_TC2) | GEN11_TBT_HOTPLUG(PORT_TC2),
+       [HPD_PORT_F] = GEN11_TC_HOTPLUG(PORT_TC3) | GEN11_TBT_HOTPLUG(PORT_TC3),
+       [HPD_PORT_G] = GEN11_TC_HOTPLUG(PORT_TC4) | GEN11_TBT_HOTPLUG(PORT_TC4),
+       [HPD_PORT_H] = GEN11_TC_HOTPLUG(PORT_TC5) | GEN11_TBT_HOTPLUG(PORT_TC5),
+       [HPD_PORT_I] = GEN11_TC_HOTPLUG(PORT_TC6) | GEN11_TBT_HOTPLUG(PORT_TC6),
 };
 
 static const u32 hpd_icp[HPD_NUM_PINS] = {

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 90a05e3..d805d4d 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -7759,32 +7759,20 @@ enum {
 #define GEN11_DE_HPD_IMR               _MMIO(0x44474)
 #define GEN11_DE_HPD_IIR               _MMIO(0x44478)
 #define GEN11_DE_HPD_IER               _MMIO(0x4447c)
-#define  GEN12_TC6_HOTPLUG                     (1 << 21)
-#define  GEN12_TC5_HOTPLUG                     (1 << 20)
-#define  GEN11_TC4_HOTPLUG                     (1 << 19)
-#define  GEN11_TC3_HOTPLUG                     (1 << 18)
-#define  GEN11_TC2_HOTPLUG                     (1 << 17)
-#define  GEN11_TC1_HOTPLUG                     (1 << 16)
 #define  GEN11_TC_HOTPLUG(tc_port)             (1 << ((tc_port) + 16))
-#define  GEN11_DE_TC_HOTPLUG_MASK              (GEN12_TC6_HOTPLUG | \
-                                                GEN12_TC5_HOTPLUG | \
-                                                GEN11_TC4_HOTPLUG | \
-                                                GEN11_TC3_HOTPLUG | \
-                                                GEN11_TC2_HOTPLUG | \
-                                                GEN11_TC1_HOTPLUG)
-#define  GEN12_TBT6_HOTPLUG                    (1 << 5)
-#define  GEN12_TBT5_HOTPLUG                    (1 << 4)
-#define  GEN11_TBT4_HOTPLUG                    (1 << 3)
-#define  GEN11_TBT3_HOTPLUG                    (1 << 2)
-#define  GEN11_TBT2_HOTPLUG                    (1 << 1)
-#define  GEN11_TBT1_HOTPLUG                    (1 << 0)
+#define  GEN11_DE_TC_HOTPLUG_MASK              (GEN11_TC_HOTPLUG(PORT_TC6) | \
+                                                GEN11_TC_HOTPLUG(PORT_TC5) | \
+                                                GEN11_TC_HOTPLUG(PORT_TC4) | \
+                                                GEN11_TC_HOTPLUG(PORT_TC3) | \
+                                                GEN11_TC_HOTPLUG(PORT_TC2) | \
+                                                GEN11_TC_HOTPLUG(PORT_TC1))
 #define  GEN11_TBT_HOTPLUG(tc_port)            (1 << (tc_port))
-#define  GEN11_DE_TBT_HOTPLUG_MASK             (GEN12_TBT6_HOTPLUG | \
-                                                GEN12_TBT5_HOTPLUG | \
-                                                GEN11_TBT4_HOTPLUG | \
-                                                GEN11_TBT3_HOTPLUG | \
-                                                GEN11_TBT2_HOTPLUG | \
-                                                GEN11_TBT1_HOTPLUG)
+#define  GEN11_DE_TBT_HOTPLUG_MASK             (GEN11_TBT_HOTPLUG(PORT_TC6) | \
+                                                GEN11_TBT_HOTPLUG(PORT_TC5) | \
+                                                GEN11_TBT_HOTPLUG(PORT_TC4) | \
+                                                GEN11_TBT_HOTPLUG(PORT_TC3) | \
+                                                GEN11_TBT_HOTPLUG(PORT_TC2) | \
+                                                GEN11_TBT_HOTPLUG(PORT_TC1))
 
 #define GEN11_TBT_HOTPLUG_CTL                          _MMIO(0x44030)
 #define GEN11_TC_HOTPLUG_CTL                           _MMIO(0x44038)