On Thu, 07 Apr 2016, Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> On Tue, Apr 05, 2016 at 10:30:52PM +0300, Jani Nikula wrote:
>> Just put the iosf port in the gpio table. The table might include some
>> duplication, but this approach keeps the code the cleanest.
>>
>> v2: pack the struct better (Ville), use designated initializers, add
>> debug logging for mismatching ports
>
> Is that even possible? As in is the index global instead of per port?
> Was there a patch to add !NC GPIOs for VLV?
Aww damn. I guess this is wrong:
commit 1d96a4a8ace6c1b08c7d203d9533b14e59f2200b
Author: Jani Nikula <jani.nikula@xxxxxxxxx>
Date: Fri Mar 18 13:11:10 2016 +0200
drm/i915/dsi: add support for DSI sequence block v2 gpio element
>
>>
>> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>> ---
>> drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 31 ++++++++++++++++--------------
>> 1 file changed, 17 insertions(+), 14 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
>> index ff0731420677..98583f37f5c7 100644
>> --- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
>> +++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
>> @@ -77,22 +77,23 @@ static inline struct vbt_panel *to_vbt_panel(struct drm_panel *panel)
>>
>> struct gpio_map {
>> u16 base_offset;
>> + u8 port;
>> bool init;
>> };
>>
>> 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 },
>> - { VLV_GPIO_NC_3_PANEL0_VDDEN },
>> - { VLV_GPIO_NC_4_PANEL0_BKLTEN },
>> - { VLV_GPIO_NC_5_PANEL0_BKLTCTL },
>> - { VLV_GPIO_NC_6_HV_DDI1_HPD },
>> - { VLV_GPIO_NC_7_HV_DDI1_DDC_SDA },
>> - { VLV_GPIO_NC_8_HV_DDI1_DDC_SCL },
>> - { VLV_GPIO_NC_9_PANEL1_VDDEN },
>> - { VLV_GPIO_NC_10_PANEL1_BKLTEN },
>> - { VLV_GPIO_NC_11_PANEL1_BKLTCTL },
>> + { .port = IOSF_PORT_GPIO_NC, .base_offset = VLV_GPIO_NC_0_HV_DDI0_HPD },
>> + { .port = IOSF_PORT_GPIO_NC, .base_offset = VLV_GPIO_NC_1_HV_DDI0_DDC_SDA },
>> + { .port = IOSF_PORT_GPIO_NC, .base_offset = VLV_GPIO_NC_2_HV_DDI0_DDC_SCL },
>> + { .port = IOSF_PORT_GPIO_NC, .base_offset = VLV_GPIO_NC_3_PANEL0_VDDEN },
>> + { .port = IOSF_PORT_GPIO_NC, .base_offset = VLV_GPIO_NC_4_PANEL0_BKLTEN },
>> + { .port = IOSF_PORT_GPIO_NC, .base_offset = VLV_GPIO_NC_5_PANEL0_BKLTCTL },
>> + { .port = IOSF_PORT_GPIO_NC, .base_offset = VLV_GPIO_NC_6_HV_DDI1_HPD },
>> + { .port = IOSF_PORT_GPIO_NC, .base_offset = VLV_GPIO_NC_7_HV_DDI1_DDC_SDA },
>> + { .port = IOSF_PORT_GPIO_NC, .base_offset = VLV_GPIO_NC_8_HV_DDI1_DDC_SCL },
>> + { .port = IOSF_PORT_GPIO_NC, .base_offset = VLV_GPIO_NC_9_PANEL1_VDDEN },
>> + { .port = IOSF_PORT_GPIO_NC, .base_offset = VLV_GPIO_NC_10_PANEL1_BKLTEN },
>> + { .port = IOSF_PORT_GPIO_NC, .base_offset = VLV_GPIO_NC_11_PANEL1_BKLTCTL },
>> };
>>
>> static inline enum port intel_dsi_seq_port_to_port(u8 port)
>> @@ -203,8 +204,7 @@ static void vlv_exec_gpio(struct drm_i915_private *dev_priv,
>> map = &vlv_gpio_table[gpio_index];
>>
>> if (dev_priv->vbt.dsi.seq_version >= 3) {
>> - DRM_DEBUG_KMS("GPIO element v3 not supported\n");
>> - return;
>> + port = map->port;
>> } else {
>> if (gpio_source == 0) {
>> port = IOSF_PORT_GPIO_NC;
>> @@ -214,6 +214,9 @@ static void vlv_exec_gpio(struct drm_i915_private *dev_priv,
>> DRM_DEBUG_KMS("unknown gpio source %u\n", gpio_source);
>> return;
>> }
>> +
>> + if (port != map->port)
>> + DRM_DEBUG_KMS("suspect gpio source %u\n", gpio_source);
>> }
>>
>> pconf0 = VLV_GPIO_PCONF0(map->base_offset);
>> --
>> 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
