[Intel-gfx] [PATCH 20/28] drm/i915: don't enumerate VGA on VLV

[Ville Syrjälä]

On Wed, Mar 06, 2013 at 11:09:08AM -0800, Jesse Barnes wrote:
> On Wed, 6 Mar 2013 21:00:11 +0200
> Ville Syrjälä <ville.syrjala at linux.intel.com> wrote:
> 
> > On Fri, Mar 01, 2013 at 01:14:23PM -0800, Jesse Barnes wrote:
> > > Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
> > > ---
> > >  drivers/gpu/drm/i915/intel_display.c |    3 ++-
> > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > > index fd4a0d4..60397e8 100644
> > > --- a/drivers/gpu/drm/i915/intel_display.c
> > > +++ b/drivers/gpu/drm/i915/intel_display.c
> > > @@ -8503,7 +8503,8 @@ static void intel_setup_outputs(struct drm_device *dev)
> > >  		I915_WRITE(PFIT_CONTROL, 0);
> > >  	}
> > >  
> > > -	if (!(HAS_DDI(dev) && (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES)))
> > > +	if (!(HAS_DDI(dev) && (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES)) &&
> > > +	    !IS_VALLEYVIEW(dev))
> > >  		intel_crt_init(dev);
> > 
> > I was under the impression that VLV still has this. Was I mistaken?
> 
> Not exposed anymore I think.  And yeah this can be dropped since the
> DDI check should dtrt.

It's testing for !HAS_DDI() which should equal true for VLV.

-- 
Ville Syrjälä
Intel OTC