[Intel-gfx] [PATCH] drm/i915/adl_p: Add adl-p ddc pin mapping

[Lee, Shawn C]

Hi all,

May I have your comment for this patch? Thank you!

Best regards,
Shawn

>From VBT, ddc pin info suggests the following mapping:
>VBT                                    DRIVER
>DDI A->ddc_pin=1 should translate to PORT_A->0x1 
>DDI B->ddc_pin=2 should translate to PORT_B->0x2
>TCP 0->ddc_pin=3 should translate to PORT_TC1->0x9
>TCP 1->ddc_pin=4 should translate to PORT_TC2->0xa
>TCP 2->ddc_pin=5 should translate to PORT_TC3->0xb
>TCP 3->ddc_pin=6 should translate to PORT_TC4->0xc
>
>Adding adl_p pin map to facilitate this translation
>as we cannot use existing icl ddc pin map due to
>DDI C is not available on adl-p platform.
>
>Bspec:20124
>
>Cc: Jani Nikula <jani.nikula at intel.com>
>Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
>Cc: Imre Deak <imre.deak at intel.com>
>Cc: Matt Roper <matthew.d.roper at intel.com>
>Cc: Lucas De Marchi <lucas.demarchi at intel.com>
>Cc: Cooper Chiou <cooper.chiou at intel.com>
>Cc: William Tseng <william.tseng at intel.com>
>Signed-off-by: Lee Shawn C <shawn.c.lee at intel.com>
>---
> drivers/gpu/drm/i915/display/intel_bios.c     | 12 ++++++++++++
> drivers/gpu/drm/i915/display/intel_vbt_defs.h |  6 +++++-
> 2 files changed, 17 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
>index 2b1423a43437..c1479e61f032 100644
>--- a/drivers/gpu/drm/i915/display/intel_bios.c
>+++ b/drivers/gpu/drm/i915/display/intel_bios.c
>@@ -1549,6 +1549,15 @@ static const u8 adls_ddc_pin_map[] = {
> 	[ADLS_DDC_BUS_PORT_TC4] = GMBUS_PIN_12_TC4_ICP,  };
> 
>+static const u8 adlp_ddc_pin_map[] = {
>+	[ICL_DDC_BUS_DDI_A] = GMBUS_PIN_1_BXT,
>+	[ICL_DDC_BUS_DDI_B] = GMBUS_PIN_2_BXT,
>+	[ADLP_DDC_BUS_PORT_TC1] = GMBUS_PIN_9_TC1_ICP,
>+	[ADLP_DDC_BUS_PORT_TC2] = GMBUS_PIN_10_TC2_ICP,
>+	[ADLP_DDC_BUS_PORT_TC3] = GMBUS_PIN_11_TC3_ICP,
>+	[ADLP_DDC_BUS_PORT_TC4] = GMBUS_PIN_12_TC4_ICP, };
>+
> static const u8 gen9bc_tgp_ddc_pin_map[] = {
> 	[DDC_BUS_DDI_B] = GMBUS_PIN_2_BXT,
> 	[DDC_BUS_DDI_C] = GMBUS_PIN_9_TC1_ICP, @@ -1563,6 +1572,9 @@ static u8 map_ddc_pin(struct drm_i915_private *i915, u8 vbt_pin)
> 	if (IS_ALDERLAKE_S(i915)) {
> 		ddc_pin_map = adls_ddc_pin_map;
> 		n_entries = ARRAY_SIZE(adls_ddc_pin_map);
>+	} else if (IS_ALDERLAKE_P(i915)) {
>+		ddc_pin_map = adlp_ddc_pin_map;
>+		n_entries = ARRAY_SIZE(adlp_ddc_pin_map);
> 	} else if (INTEL_PCH_TYPE(i915) >= PCH_DG1) {
> 		return vbt_pin;
> 	} else if (IS_ROCKETLAKE(i915) && INTEL_PCH_TYPE(i915) == PCH_TGP) { diff --git a/drivers/gpu/drm/i915/display/intel_vbt_defs.h b/drivers/gpu/drm/i915/display/intel_vbt_defs.h
>index a2108a8f544d..d5be01b983f4 100644
>--- a/drivers/gpu/drm/i915/display/intel_vbt_defs.h
>+++ b/drivers/gpu/drm/i915/display/intel_vbt_defs.h
>@@ -330,7 +330,11 @@ enum vbt_gmbus_ddi {
> 	ADLS_DDC_BUS_PORT_TC1 = 0x2,
> 	ADLS_DDC_BUS_PORT_TC2,
> 	ADLS_DDC_BUS_PORT_TC3,
>-	ADLS_DDC_BUS_PORT_TC4
>+	ADLS_DDC_BUS_PORT_TC4,
>+	ADLP_DDC_BUS_PORT_TC1 = 0x3,
>+	ADLP_DDC_BUS_PORT_TC2,
>+	ADLP_DDC_BUS_PORT_TC3,
>+	ADLP_DDC_BUS_PORT_TC4,
> };
> 
> #define DP_AUX_A 0x40
>--
>2.17.1
>