aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-08-04 06:17:25 -0400
committerEric Anholt <eric@anholt.net>2010-08-09 14:24:27 -0400
commit3e33d94df7f5c94adb09139b5d816a248d703a36 (patch)
tree6c5d7f39d9c73d5a6db5b777d9a06156ef8f78ba /drivers
parent45d7f32c7a43cbb9592886d38190e379e2eb2226 (diff)
drm/i915: Remove useless message when disabling "Big FIFO" on PineView
As we already have appropriate debug and warnings when we activate and deactivate the self-refresh FIFO, having a further INFO is just annoying. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 1e5e0d379fa9..1490a8c14d26 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2930,13 +2930,9 @@ static struct cxsr_latency *intel_get_cxsr_latency(int is_desktop, int is_ddr3,
2930static void pineview_disable_cxsr(struct drm_device *dev) 2930static void pineview_disable_cxsr(struct drm_device *dev)
2931{ 2931{
2932 struct drm_i915_private *dev_priv = dev->dev_private; 2932 struct drm_i915_private *dev_priv = dev->dev_private;
2933 u32 reg;
2934 2933
2935 /* deactivate cxsr */ 2934 /* deactivate cxsr */
2936 reg = I915_READ(DSPFW3); 2935 I915_WRITE(DSPFW3, I915_READ(DSPFW3) & ~PINEVIEW_SELF_REFRESH_EN);
2937 reg &= ~(PINEVIEW_SELF_REFRESH_EN);
2938 I915_WRITE(DSPFW3, reg);
2939 DRM_INFO("Big FIFO is disabled\n");
2940} 2936}
2941 2937
2942/* 2938/*
@@ -3075,9 +3071,8 @@ static void pineview_update_wm(struct drm_device *dev, int planea_clock,
3075 DRM_DEBUG_KMS("DSPFW3 register is %x\n", reg); 3071 DRM_DEBUG_KMS("DSPFW3 register is %x\n", reg);
3076 3072
3077 /* activate cxsr */ 3073 /* activate cxsr */
3078 reg = I915_READ(DSPFW3); 3074 I915_WRITE(DSPFW3,
3079 reg |= PINEVIEW_SELF_REFRESH_EN; 3075 I915_READ(DSPFW3) | PINEVIEW_SELF_REFRESH_EN);
3080 I915_WRITE(DSPFW3, reg);
3081 DRM_DEBUG_KMS("Self-refresh is enabled\n"); 3076 DRM_DEBUG_KMS("Self-refresh is enabled\n");
3082 } else { 3077 } else {
3083 pineview_disable_cxsr(dev); 3078 pineview_disable_cxsr(dev);