Re: [PATCH 3/6] drm/i915: IVB FBC WaFbcDisableDpfcClockGating

["Ville Syrjälä" <ville.syrjala@linux.intel.com>]

On Thu, Apr 25, 2013 at 02:15:22PM -0300, Rodrigo Vivi wrote:
> Display register 42020h bit 9 must be set to 1b for the entire time that
> Frame Buffer Compression is enabled.
> 
> v2: RMW to preserve other bits (by Ville)
> 
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
> ---
>  drivers/gpu/drm/i915/intel_pm.c | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index e7373a5..fed3610 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -242,6 +242,12 @@ static void ironlake_disable_fbc(struct drm_device *dev)
>  		dpfc_ctl &= ~DPFC_CTL_EN;
>  		I915_WRITE(ILK_DPFC_CONTROL, dpfc_ctl);
>  
> +		if (IS_IVYBRIDGE(dev))
> +			/* WaFbcDisableDpfcClockGating */
> +			I915_WRITE(ILK_DSPCLK_GATE_D,
> +				   I915_READ(ILK_DSPCLK_GATE_D) &
> +				   ~ILK_DPFCUNIT_CLOCK_GATE_DISABLE);
> +
>  		DRM_DEBUG_KMS("disabled FBC\n");
>  	}
>  }
> @@ -270,6 +276,11 @@ static void gen7_enable_fbc(struct drm_crtc *crtc, unsigned long interval)
>  
>  	/* WaFbcAsynchFlipDisableFbcQueue */
>  	I915_WRITE(ILK_DISPLAY_CHICKEN1, ILK_FBCQ_DIS);
> +	/* WaFbcDisableDpfcClockGating */
> +	I915_WRITE(ILK_DSPCLK_GATE_D,
> +		   I915_READ(ILK_DSPCLK_GATE_D) &
                                                ^
Should be '|'

> +		   ILK_DPFCUNIT_CLOCK_GATE_DISABLE);
> +
>  	I915_WRITE(SNB_DPFC_CTL_SA,
>  		   SNB_CPU_FENCE_ENABLE | obj->fence_reg);
>  	I915_WRITE(DPFC_CPU_FENCE_OFFSET, crtc->y);
> -- 
> 1.8.1.4

-- 
Ville Syrjälä
Intel OTC