]> git.karo-electronics.de Git - linux-beck.git/commitdiff
drm/i915: Add missing platform tags to FBC workaround comments
authorDamien Lespiau <damien.lespiau@intel.com>
Fri, 10 May 2013 13:33:17 +0000 (14:33 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 10 May 2013 19:56:52 +0000 (21:56 +0200)
There was a race between Rodrigo writing those patches and me
formalizing the addition of platform tags. This patches fixes it.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_pm.c

index d806448f84fa7a8d06075d3185b664ea2dea3041..28cec57e3f8c465e4ff4d0dccf6abb3f0c2fb947 100644 (file)
@@ -243,13 +243,13 @@ static void ironlake_disable_fbc(struct drm_device *dev)
                I915_WRITE(ILK_DPFC_CONTROL, dpfc_ctl);
 
                if (IS_IVYBRIDGE(dev))
-                       /* WaFbcDisableDpfcClockGating */
+                       /* WaFbcDisableDpfcClockGating:ivb */
                        I915_WRITE(ILK_DSPCLK_GATE_D,
                                   I915_READ(ILK_DSPCLK_GATE_D) &
                                   ~ILK_DPFCUNIT_CLOCK_GATE_DISABLE);
 
                if (IS_HASWELL(dev))
-                       /* WaFbcDisableDpfcClockGating */
+                       /* WaFbcDisableDpfcClockGating:hsw */
                        I915_WRITE(HSW_CLKGATE_DISABLE_PART_1,
                                   I915_READ(HSW_CLKGATE_DISABLE_PART_1) &
                                   ~HSW_DPFC_GATING_DISABLE);
@@ -281,17 +281,17 @@ static void gen7_enable_fbc(struct drm_crtc *crtc, unsigned long interval)
                   intel_crtc->plane << IVB_DPFC_CTL_PLANE_SHIFT);
 
        if (IS_IVYBRIDGE(dev)) {
-               /* WaFbcAsynchFlipDisableFbcQueue */
+               /* WaFbcAsynchFlipDisableFbcQueue:ivb */
                I915_WRITE(ILK_DISPLAY_CHICKEN1, ILK_FBCQ_DIS);
-               /* WaFbcDisableDpfcClockGating */
+               /* WaFbcDisableDpfcClockGating:ivb */
                I915_WRITE(ILK_DSPCLK_GATE_D,
                           I915_READ(ILK_DSPCLK_GATE_D) |
                           ILK_DPFCUNIT_CLOCK_GATE_DISABLE);
        } else {
-               /* WaFbcAsynchFlipDisableFbcQueue */
+               /* WaFbcAsynchFlipDisableFbcQueue:hsw */
                I915_WRITE(HSW_PIPE_SLICE_CHICKEN_1(intel_crtc->pipe),
                           HSW_BYPASS_FBC_QUEUE);
-               /* WaFbcDisableDpfcClockGating */
+               /* WaFbcDisableDpfcClockGating:hsw */
                I915_WRITE(HSW_CLKGATE_DISABLE_PART_1,
                           I915_READ(HSW_CLKGATE_DISABLE_PART_1) |
                           HSW_DPFC_GATING_DISABLE);