Add some VLV prefixes, remove redundant initialization, etc. No
functional changes.
Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 60 +++++++++++++++---------------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
index 82047eefd3e1..3c6275f85ae2 100644
--- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
+++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
@@ -58,39 +58,39 @@ static inline struct vbt_panel *to_vbt_panel(struct
drm_panel *panel)
#define NS_KHZ_RATIO 1000000
-#define GPI0_NC_0_HV_DDI0_HPD 0x4130
-#define GPIO_NC_1_HV_DDI0_DDC_SDA 0x4120
-#define GPIO_NC_2_HV_DDI0_DDC_SCL 0x4110
-#define GPIO_NC_3_PANEL0_VDDEN 0x4140
-#define GPIO_NC_4_PANEL0_BLKEN 0x4150
-#define GPIO_NC_5_PANEL0_BLKCTL 0x4160
-#define GPIO_NC_6_PCONF0 0x4180
-#define GPIO_NC_7_PCONF0 0x4190
-#define GPIO_NC_8_PCONF0 0x4170
-#define GPIO_NC_9_PCONF0 0x4100
-#define GPIO_NC_10_PCONF0 0x40E0
-#define GPIO_NC_11_PCONF0 0x40F0
+#define VLV_GPIO_NC_0_HV_DDI0_HPD 0x4130
+#define VLV_GPIO_NC_1_HV_DDI0_DDC_SDA 0x4120
+#define VLV_GPIO_NC_2_HV_DDI0_DDC_SCL 0x4110
+#define VLV_GPIO_NC_3_PANEL0_VDDEN 0x4140
+#define VLV_GPIO_NC_4_PANEL0_BLKEN 0x4150
+#define VLV_GPIO_NC_5_PANEL0_BLKCTL 0x4160
+#define VLV_GPIO_NC_6_PCONF0 0x4180
+#define VLV_GPIO_NC_7_PCONF0 0x4190
+#define VLV_GPIO_NC_8_PCONF0 0x4170
+#define VLV_GPIO_NC_9_PCONF0 0x4100
+#define VLV_GPIO_NC_10_PCONF0 0x40E0
+#define VLV_GPIO_NC_11_PCONF0 0x40F0
#define VLV_FUNCTION_TO_PAD_REG(reg) ((reg) + 8)
struct gpio_table {
u16 function_reg;
- u8 init;
+ bool init;
};
-static struct gpio_table gtable[] = {
- { GPI0_NC_0_HV_DDI0_HPD, 0 },
- { GPIO_NC_1_HV_DDI0_DDC_SDA, 0 },
- { GPIO_NC_2_HV_DDI0_DDC_SCL, 0 },
- { GPIO_NC_3_PANEL0_VDDEN, 0 },
- { GPIO_NC_4_PANEL0_BLKEN, 0 },
- { GPIO_NC_5_PANEL0_BLKCTL, 0 },
- { GPIO_NC_6_PCONF0, 0 },
- { GPIO_NC_7_PCONF0, 0 },
- { GPIO_NC_8_PCONF0, 0 },
- { GPIO_NC_9_PCONF0, 0 },
- { GPIO_NC_10_PCONF0, 0},
- { GPIO_NC_11_PCONF0, 0}
+static struct gpio_table vlv_gpio_table[] = {
+ { VLV_GPIO_NC_0_HV_DDI0_HPD },
+ { VLV_GPIO_NC_1_HV_DDI0_DDC_SDA },
+ { VLV_GPIO_NC_2_HV_DDI0_DDC_SCL },
+ { VLV_GPIO_NC_3_PANEL0_VDDEN },
+ { VLV_GPIO_NC_4_PANEL0_BLKEN },
+ { VLV_GPIO_NC_5_PANEL0_BLKCTL },
+ { VLV_GPIO_NC_6_PCONF0 },
+ { VLV_GPIO_NC_7_PCONF0 },
+ { VLV_GPIO_NC_8_PCONF0 },
+ { VLV_GPIO_NC_9_PCONF0 },
+ { VLV_GPIO_NC_10_PCONF0 },
+ { VLV_GPIO_NC_11_PCONF0 },
};
static inline enum port intel_dsi_seq_port_to_port(u8 port)
@@ -192,7 +192,7 @@ static void vlv_exec_gpio(struct drm_i915_private *dev_priv,
u16 function, pad;
u8 port;
- if (gpio_index >= ARRAY_SIZE(gtable)) {
+ if (gpio_index >= ARRAY_SIZE(vlv_gpio_table)) {
DRM_DEBUG_KMS("unknown gpio %u\n", gpio_index);
return;
}
@@ -213,15 +213,15 @@ static void vlv_exec_gpio(struct drm_i915_private
*dev_priv,
port = IOSF_PORT_GPIO_NC;
}
- function = gtable[gpio_index].function_reg;
+ function = vlv_gpio_table[gpio_index].function_reg;
pad = VLV_FUNCTION_TO_PAD_REG(function);
mutex_lock(&dev_priv->sb_lock);
- if (!gtable[gpio_index].init) {
+ if (!vlv_gpio_table[gpio_index].init) {
/* program the function */
/* FIXME: remove constant below */
vlv_iosf_sb_write(dev_priv, port, function, 0x2000CC00);
- gtable[gpio_index].init = 1;
+ vlv_gpio_table[gpio_index].init = true;
}
val = 0x4 | action;
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
