]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
drm/i915: Set the required VFMUNIT clock gating disable on Ironlake.
authorEric Anholt <eric@anholt.net>
Tue, 14 Dec 2010 18:06:46 +0000 (10:06 -0800)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 23 Dec 2010 09:49:40 +0000 (09:49 +0000)
It's required by the specs, but we don't know why.  Let's not find out
why.

Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_display.c

index 878fc766a12cc05f6b30c90d53d65a52c6023727..8470a972f1bb0adadcf1e77e99afc6bea15db33e 100644 (file)
 # define MARIUNIT_CLOCK_GATE_DISABLE           (1 << 18)
 # define SVSMUNIT_CLOCK_GATE_DISABLE           (1 << 1)
 
+#define PCH_3DCGDIS1           0x46024
+# define VFMUNIT_CLOCK_GATE_DISABLE            (1 << 11)
+
 #define FDI_PLL_FREQ_CTL        0x46030
 #define  FDI_PLL_FREQ_CHANGE_REQUEST    (1<<24)
 #define  FDI_PLL_FREQ_LOCK_LIMIT_MASK   0xfff00
index d9b7092439ef59ab19acc9546a039ff60f0bb43c..97e374ec7f72c697d63cd50b6da721e53e6b51e7 100644 (file)
@@ -5825,6 +5825,8 @@ void intel_init_clock_gating(struct drm_device *dev)
                        I915_WRITE(PCH_3DCGDIS0,
                                   MARIUNIT_CLOCK_GATE_DISABLE |
                                   SVSMUNIT_CLOCK_GATE_DISABLE);
+                       I915_WRITE(PCH_3DCGDIS1,
+                                  VFMUNIT_CLOCK_GATE_DISABLE);
                }
 
                I915_WRITE(PCH_DSPCLK_GATE_D, dspclk_gate);