On Thu, 07 Apr 2016, Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> On Tue, Apr 05, 2016 at 10:30:51PM +0300, Jani Nikula wrote:
>> The shorthand is easier. Also change the struct name. No functional
>> changes.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>
> Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Pushed the first three to drm-intel-next-queued, with the fixme comment
restored in patch 2, thanks for the review.
BR,
Jani.
>
>> ---
>> drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 15 +++++++++------
>> 1 file changed, 9 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
>> index 6c2774ceb69f..ff0731420677 100644
>> --- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
>> +++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
>> @@ -75,12 +75,12 @@ static inline struct vbt_panel *to_vbt_panel(struct drm_panel *panel)
>> #define VLV_GPIO_PCONF0(base_offset) (base_offset)
>> #define VLV_GPIO_PAD_VAL(base_offset) ((base_offset) + 8)
>>
>> -struct gpio_table {
>> +struct gpio_map {
>> u16 base_offset;
>> bool init;
>> };
>>
>> -static struct gpio_table vlv_gpio_table[] = {
>> +static struct gpio_map 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 },
>> @@ -190,6 +190,7 @@ static const u8 *mipi_exec_delay(struct intel_dsi *intel_dsi, const u8 *data)
>> static void vlv_exec_gpio(struct drm_i915_private *dev_priv,
>> u8 gpio_source, u8 gpio_index, bool value)
>> {
>> + struct gpio_map *map;
>> u16 pconf0, padval;
>> u32 tmp;
>> u8 port;
>> @@ -199,6 +200,8 @@ static void vlv_exec_gpio(struct drm_i915_private *dev_priv,
>> return;
>> }
>>
>> + map = &vlv_gpio_table[gpio_index];
>> +
>> if (dev_priv->vbt.dsi.seq_version >= 3) {
>> DRM_DEBUG_KMS("GPIO element v3 not supported\n");
>> return;
>> @@ -213,13 +216,13 @@ static void vlv_exec_gpio(struct drm_i915_private *dev_priv,
>> }
>> }
>>
>> - pconf0 = VLV_GPIO_PCONF0(vlv_gpio_table[gpio_index].base_offset);
>> - padval = VLV_GPIO_PAD_VAL(vlv_gpio_table[gpio_index].base_offset);
>> + pconf0 = VLV_GPIO_PCONF0(map->base_offset);
>> + padval = VLV_GPIO_PAD_VAL(map->base_offset);
>>
>> mutex_lock(&dev_priv->sb_lock);
>> - if (!vlv_gpio_table[gpio_index].init) {
>> + if (!map->init) {
>> vlv_iosf_sb_write(dev_priv, port, pconf0, 0x2000CC00);
>> - vlv_gpio_table[gpio_index].init = true;
>> + map->init = true;
>> }
>>
>> tmp = 0x4 | value;
>> --
>> 2.1.4
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
