On Mon, 2019-07-08 at 16:16 -0700, Lucas De Marchi wrote:
> From: Mahesh Kumar <mahesh1.kumar@xxxxxxxxx>
>
> Add VBT-value to DDC bus pin mapping for the same.
We have almost the same information in 3 different places as per patch
15, 16 and this one =/
Anyways lets not block TGL to do refactors:
Reviewed-by: José Roberto de Souza <jose.souza@xxxxxxxxx>
>
> Signed-off-by: Mahesh Kumar <mahesh1.kumar@xxxxxxxxx>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_bios.c | 17 ++++++++++++++++-
> drivers/gpu/drm/i915/display/intel_vbt_defs.h | 3 +++
> 2 files changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c
> b/drivers/gpu/drm/i915/display/intel_bios.c
> index 0c9808132d67..a08bc4f617c8 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.c
> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> @@ -1354,12 +1354,27 @@ static const u8 mcc_ddc_pin_map[] = {
> [MCC_DDC_BUS_DDI_C] = GMBUS_PIN_9_TC1_ICP,
> };
>
> +static const u8 tgp_ddc_pin_map[] = {
> + [ICL_DDC_BUS_DDI_A] = GMBUS_PIN_1_BXT,
> + [ICL_DDC_BUS_DDI_B] = GMBUS_PIN_2_BXT,
> + [TGL_DDC_BUS_DDI_C] = GMBUS_PIN_3_BXT,
> + [ICL_DDC_BUS_PORT_1] = GMBUS_PIN_9_TC1_ICP,
> + [ICL_DDC_BUS_PORT_2] = GMBUS_PIN_10_TC2_ICP,
> + [ICL_DDC_BUS_PORT_3] = GMBUS_PIN_11_TC3_ICP,
> + [ICL_DDC_BUS_PORT_4] = GMBUS_PIN_12_TC4_ICP,
> + [TGL_DDC_BUS_PORT_5] = GMBUS_PIN_13_TC5_TGP,
> + [TGL_DDC_BUS_PORT_6] = GMBUS_PIN_14_TC6_TGP,
> +};
> +
> static u8 map_ddc_pin(struct drm_i915_private *dev_priv, u8 vbt_pin)
> {
> const u8 *ddc_pin_map;
> int n_entries;
>
> - if (HAS_PCH_MCC(dev_priv)) {
> + if (HAS_PCH_TGP(dev_priv)) {
> + ddc_pin_map = tgp_ddc_pin_map;
> + n_entries = ARRAY_SIZE(tgp_ddc_pin_map);
> + } else if (HAS_PCH_MCC(dev_priv)) {
> ddc_pin_map = mcc_ddc_pin_map;
> n_entries = ARRAY_SIZE(mcc_ddc_pin_map);
> } else if (HAS_PCH_ICP(dev_priv)) {
> diff --git a/drivers/gpu/drm/i915/display/intel_vbt_defs.h
> b/drivers/gpu/drm/i915/display/intel_vbt_defs.h
> index 2f4894e9a03d..93f5c9d204d6 100644
> --- a/drivers/gpu/drm/i915/display/intel_vbt_defs.h
> +++ b/drivers/gpu/drm/i915/display/intel_vbt_defs.h
> @@ -310,10 +310,13 @@ enum vbt_gmbus_ddi {
> DDC_BUS_DDI_F,
> ICL_DDC_BUS_DDI_A = 0x1,
> ICL_DDC_BUS_DDI_B,
> + TGL_DDC_BUS_DDI_C,
> ICL_DDC_BUS_PORT_1 = 0x4,
> ICL_DDC_BUS_PORT_2,
> ICL_DDC_BUS_PORT_3,
> ICL_DDC_BUS_PORT_4,
> + TGL_DDC_BUS_PORT_5,
> + TGL_DDC_BUS_PORT_6,
> MCC_DDC_BUS_DDI_A = 0x1,
> MCC_DDC_BUS_DDI_B,
> MCC_DDC_BUS_DDI_C = 0x4,
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
