[Intel-gfx] [PATCH v2] drm/i915/ddi: Rely on VBT DDI port info for eDP detection

[Imre Deak]

On Thu, 2016-12-22 at 11:12 +0200, David Weinehall wrote:
> On Wed, Dec 21, 2016 at 12:17:24PM +0200, Imre Deak wrote:
> > There is at least one APL based system using port A in DP mode
> > (connecting to an on-board DP->VGA adaptor). Atm we'll configure port A
> > unconditionally as eDP which is incorrect in this case. Fix this by
> > relying on the VBT DDI port 'internal port' flag instead on all ports on
> > DDI platforms. For now chicken out from using VBT for port A before
> > GEN9.
> > 
> > v2:
> > - Move the DDI port info lookup to intel_bios_is_port_edp() (David, Jani)
> > - Use the DDI port info on all DDI platforms starting for port B.
> > 
> > > > Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > > > Cc: Jani Nikula <jani.nikula at intel.com>
> > > > Cc: David Weinehall <david.weinehall at linux.intel.com>
> > > > Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com> (v1)
> > Signed-off-by: Imre Deak <imre.deak at intel.com>
> 
> Much happier with this one.
> 
> Reviewed-by: David Weinehall <david.weinehall at linux.intel.com>

Pushed to -dinq, thanks for the reviews.

> > ---
> >  drivers/gpu/drm/i915/i915_drv.h   | 1 +
> >  drivers/gpu/drm/i915/intel_bios.c | 4 ++++
> >  drivers/gpu/drm/i915/intel_dp.c   | 2 +-
> >  3 files changed, 6 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> > index 77d7a07..1a91409 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -1669,6 +1669,7 @@ struct ddi_vbt_port_info {
> > > >  	uint8_t supports_dvi:1;
> > > >  	uint8_t supports_hdmi:1;
> > > >  	uint8_t supports_dp:1;
> > > > +	uint8_t supports_edp:1;
> >  
> > > >  	uint8_t alternate_aux_channel;
> > > >  	uint8_t alternate_ddc_pin;
> > diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
> > index 1cf2fa6..a359def 100644
> > --- a/drivers/gpu/drm/i915/intel_bios.c
> > +++ b/drivers/gpu/drm/i915/intel_bios.c
> > @@ -1161,6 +1161,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
> > > >  	info->supports_dvi = is_dvi;
> > > >  	info->supports_hdmi = is_hdmi;
> > > >  	info->supports_dp = is_dp;
> > > > +	info->supports_edp = is_edp;
> >  
> > > >  	DRM_DEBUG_KMS("Port %c VBT info: DP:%d HDMI:%d DVI:%d EDP:%d CRT:%d\n",
> > > >  		      port_name(port), is_dp, is_hdmi, is_dvi, is_edp, is_crt);
> > @@ -1664,6 +1665,9 @@ bool intel_bios_is_port_edp(struct drm_i915_private *dev_priv, enum port port)
> > > >  	};
> > > >  	int i;
> >  
> > > > +	if (HAS_DDI(dev_priv))
> > > > +		return dev_priv->vbt.ddi_port_info[port].supports_edp;
> > +
> > > >  	if (!dev_priv->vbt.child_dev_num)
> > > >  		return false;
> >  
> > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> > index 66b5bc8..746c237 100644
> > --- a/drivers/gpu/drm/i915/intel_dp.c
> > +++ b/drivers/gpu/drm/i915/intel_dp.c
> > @@ -4975,7 +4975,7 @@ bool intel_dp_is_edp(struct drm_i915_private *dev_priv, enum port port)
> > > >  	if (INTEL_GEN(dev_priv) < 5)
> > > >  		return false;
> >  
> > > > -	if (port == PORT_A)
> > > > +	if (INTEL_GEN(dev_priv) < 9 && port == PORT_A)
> > > >  		return true;
> >  
> > > >  	return intel_bios_is_port_edp(dev_priv, port);
> > -- 
> > 2.5.0
> >