Re: [PATCH 15/19] drm/i915: use power domain api to check vga power state

[Daniel Vetter <daniel@ffwll.ch>]

On Thu, Feb 20, 2014 at 11:51:33AM -0800, Jesse Barnes wrote:
> On Tue, 18 Feb 2014 00:02:16 +0200
> Imre Deak <imre.deak@intel.com> wrote:
> 
> > This way we can reuse the check on other platforms too. Also factor out
> > a version of the function that doesn't check if the power is on, we'll
> > need to call this from within the power domain framework.
> > 
> > Signed-off-by: Imre Deak <imre.deak@intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_drv.h      |  1 +
> >  drivers/gpu/drm/i915/intel_display.c | 20 +++++++++++++-------
> >  2 files changed, 14 insertions(+), 7 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> > index 76bd03a..632f9d8 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -2591,6 +2591,7 @@ extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state);
> >  extern void intel_modeset_setup_hw_state(struct drm_device *dev,
> >  					 bool force_restore);
> >  extern void i915_redisable_vga(struct drm_device *dev);
> > +extern void i915_redisable_vga_power_on(struct drm_device *dev);
> >  extern bool intel_fbc_enabled(struct drm_device *dev);
> >  extern void intel_disable_fbc(struct drm_device *dev);
> >  extern bool ironlake_set_drps(struct drm_device *dev, u8 val);
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index e3824f8..ea00878 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -11304,10 +11304,20 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)
> >  	 * the crtc fixup. */
> >  }
> >  
> > +void i915_redisable_vga_power_on(struct drm_device *dev)
> > +{
> > +	struct drm_i915_private *dev_priv = dev->dev_private;
> > +	u32 vga_reg = i915_vgacntrl_reg(dev);
> > +
> > +	if (!(I915_READ(vga_reg) & VGA_DISP_DISABLE)) {
> > +		DRM_DEBUG_KMS("Something enabled VGA plane, disabling it\n");
> > +		i915_disable_vga(dev);
> > +	}
> > +}
> > +
> >  void i915_redisable_vga(struct drm_device *dev)
> >  {
> >  	struct drm_i915_private *dev_priv = dev->dev_private;
> > -	u32 vga_reg = i915_vgacntrl_reg(dev);
> >  
> >  	/* This function can be called both from intel_modeset_setup_hw_state or
> >  	 * at a very early point in our resume sequence, where the power well
> > @@ -11316,14 +11326,10 @@ void i915_redisable_vga(struct drm_device *dev)
> >  	 * level, just check if the power well is enabled instead of trying to
> >  	 * follow the "don't touch the power well if we don't need it" policy
> >  	 * the rest of the driver uses. */
> > -	if ((IS_HASWELL(dev) || IS_BROADWELL(dev)) &&
> > -	    (I915_READ(HSW_PWR_WELL_DRIVER) & HSW_PWR_WELL_STATE_ENABLED) == 0)
> > +	if (!intel_display_power_enabled(dev_priv, POWER_DOMAIN_VGA))
> >  		return;
> >  
> > -	if (!(I915_READ(vga_reg) & VGA_DISP_DISABLE)) {
> > -		DRM_DEBUG_KMS("Something enabled VGA plane, disabling it\n");
> > -		i915_disable_vga(dev);
> > -	}
> > +	i915_redisable_vga_power_on(dev);
> >  }
> >  
> >  static void intel_modeset_readout_hw_state(struct drm_device *dev)
> 
> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>

Queued for -next, thanks for the patch.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch