[Intel-gfx] [PATCH 07/20] drm/i915: Use AUX_CH_USBCn for the RKL VBT AUX CH setup

[Ville Syrjälä]

On Wed, Oct 07, 2020 at 04:11:45PM -0700, Lucas De Marchi wrote:
> On Tue, Oct 06, 2020 at 05:33:36PM +0300, Ville Syrjälä wrote:
> >From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> >
> >As with the VBT DVO port, RKL uses PHY based mapping for the
> >VBT AUX CH. Adjust the code to use the new AUX_USBCn names
> >and add a comment to explain the situation.
> >
> >Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> >---
> > drivers/gpu/drm/i915/display/intel_bios.c | 8 ++++++--
> > 1 file changed, 6 insertions(+), 2 deletions(-)
> >
> >diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> >index 179029c3d3d5..77c86f51c36d 100644
> >--- a/drivers/gpu/drm/i915/display/intel_bios.c
> >+++ b/drivers/gpu/drm/i915/display/intel_bios.c
> >@@ -2636,10 +2636,14 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *dev_priv,
> > 		aux_ch = AUX_CH_B;
> > 		break;
> > 	case DP_AUX_C:
> >-		aux_ch = IS_ROCKETLAKE(dev_priv) ? AUX_CH_D : AUX_CH_C;
> >+		/*
> >+		 * RKL VBT uses PHY based mapping. Combo PHYs A,B,C,D
> >+		 * map to DDI A,B,TC1,TC2 respectively.
> 
> This will conflict with DG1 that was just merged and use the same
> mapping as RKL. Change here LGTM.

Aye. I'm still pondering how to make this VBT port stuf not
suck so badly. I guess some kind of platform dependent
i915->VBT enum mapping function(s) could work, but not sure.

> 
> Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>
> 
> Lucas De Marchi
> 
> >+		 */
> >+		aux_ch = IS_ROCKETLAKE(dev_priv) ? AUX_CH_USBC1 : AUX_CH_C;
> > 		break;
> > 	case DP_AUX_D:
> >-		aux_ch = IS_ROCKETLAKE(dev_priv) ? AUX_CH_E : AUX_CH_D;
> >+		aux_ch = IS_ROCKETLAKE(dev_priv) ? AUX_CH_USBC2 : AUX_CH_D;
> > 		break;
> > 	case DP_AUX_E:
> > 		aux_ch = AUX_CH_E;
> >-- 
> >2.26.2
> >
> >_______________________________________________
> >Intel-gfx mailing list
> >Intel-gfx at lists.freedesktop.org
> >https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel