diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2013-06-07 03:47:03 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-06-07 04:38:04 -0400 |
commit | bdad2b2f31852af4eb450d6a96e38940a0a1fdef (patch) | |
tree | 5c52c0be28f1893068b8d5cce444be10e8419550 | |
parent | 20f949670f51341f255b17ec4650fa69ba22cb87 (diff) |
drm/i915: Disable trickle feed in ironlake_init_clock_gating()
We disable trickle feed in all the (relevant) clock gating functions,
except ironlake_init_clock_gating(). Copy paste the same code there as
well.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 2948764d7e38..78addac68521 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c | |||
@@ -4391,6 +4391,7 @@ static void ironlake_init_clock_gating(struct drm_device *dev) | |||
4391 | { | 4391 | { |
4392 | struct drm_i915_private *dev_priv = dev->dev_private; | 4392 | struct drm_i915_private *dev_priv = dev->dev_private; |
4393 | uint32_t dspclk_gate = ILK_VRHUNIT_CLOCK_GATE_DISABLE; | 4393 | uint32_t dspclk_gate = ILK_VRHUNIT_CLOCK_GATE_DISABLE; |
4394 | int pipe; | ||
4394 | 4395 | ||
4395 | /* Required for FBC */ | 4396 | /* Required for FBC */ |
4396 | dspclk_gate |= ILK_DPFCRUNIT_CLOCK_GATE_DISABLE | | 4397 | dspclk_gate |= ILK_DPFCRUNIT_CLOCK_GATE_DISABLE | |
@@ -4450,6 +4451,13 @@ static void ironlake_init_clock_gating(struct drm_device *dev) | |||
4450 | I915_WRITE(CACHE_MODE_0, | 4451 | I915_WRITE(CACHE_MODE_0, |
4451 | _MASKED_BIT_ENABLE(CM0_PIPELINED_RENDER_FLUSH_DISABLE)); | 4452 | _MASKED_BIT_ENABLE(CM0_PIPELINED_RENDER_FLUSH_DISABLE)); |
4452 | 4453 | ||
4454 | for_each_pipe(pipe) { | ||
4455 | I915_WRITE(DSPCNTR(pipe), | ||
4456 | I915_READ(DSPCNTR(pipe)) | | ||
4457 | DISPPLANE_TRICKLE_FEED_DISABLE); | ||
4458 | intel_flush_display_plane(dev_priv, pipe); | ||
4459 | } | ||
4460 | |||
4453 | ibx_init_clock_gating(dev); | 4461 | ibx_init_clock_gating(dev); |
4454 | } | 4462 | } |
4455 | 4463 | ||