[Intel-gfx] [PATCH 10/12] drm/i915/skl: Remove WaDisableVFUnitClockGating

[Daniel Vetter]

On Fri, Sep 25, 2015 at 08:45:25PM +0300, Ville Syrjälä wrote:
> On Fri, Sep 25, 2015 at 02:33:44PM +0100, Arun Siluvery wrote:
> > Dropping it because it is for pre-production stepping, also removed
> > bit definition in i915_reg.h as it is not used anywhere else.
> > 
> > Signed-off-by: Arun Siluvery <arun.siluvery at linux.intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_reg.h | 1 -
> >  drivers/gpu/drm/i915/intel_pm.c | 6 ------
> >  2 files changed, 7 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> > index ef3d71f..b510fdc 100644
> > --- a/drivers/gpu/drm/i915/i915_reg.h
> > +++ b/drivers/gpu/drm/i915/i915_reg.h
> > @@ -6688,7 +6688,6 @@ enum skl_disp_power_wells {
> >  # define GEN6_CSUNIT_CLOCK_GATE_DISABLE			(1 << 7)
> >  
> >  #define GEN6_UCGCTL2				0x9404
> > -# define GEN6_VFUNIT_CLOCK_GATE_DISABLE			(1 << 31)
> 
> Again, I would keep the define.

I kept them both (but forgot to mention in my previous reply).

> 
> >  # define GEN7_VDSUNIT_CLOCK_GATE_DISABLE		(1 << 30)
> >  # define GEN7_TDLUNIT_CLOCK_GATE_DISABLE		(1 << 22)
> >  # define GEN6_RCZUNIT_CLOCK_GATE_DISABLE		(1 << 13)
> > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> > index 65c60bc..88acb3e 100644
> > --- a/drivers/gpu/drm/i915/intel_pm.c
> > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > @@ -75,12 +75,6 @@ static void skl_init_clock_gating(struct drm_device *dev)
> >  
> >  	gen9_init_clock_gating(dev);
> >  
> > -	if (INTEL_REVID(dev) <= SKL_REVID_B0) {
> > -		/* WaDisableVFUnitClockGating:skl */
> > -		I915_WRITE(GEN6_UCGCTL2, I915_READ(GEN6_UCGCTL2) |
> > -			   GEN6_VFUNIT_CLOCK_GATE_DISABLE);
> > -	}
> > -
> 
> Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Queued for -next, thanks for the patch.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch