aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-02-02 05:41:20 -0500
committerChris Wilson <chris@chris-wilson.co.uk>2011-02-07 07:04:52 -0500
commit308977ac03117706c342099a40919b3da2667cce (patch)
treea6f714b911953b07d1debda9ab218691fc5658c3 /drivers/gpu/drm/i915/intel_display.c
parentb6f7833b9712c0c01f94cc3a518dc62b07bd610b (diff)
drm/i915: Use DEBUG_KMS for the self-refresh watermarks
For consistency and segregation from the noisy DRM_DEBUG(). Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e18725735718..a4acef6c1474 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3805,10 +3805,10 @@ static void g4x_update_wm(struct drm_device *dev)
3805 I915_WRITE(FW_BLC_SELF, 3805 I915_WRITE(FW_BLC_SELF,
3806 I915_READ(FW_BLC_SELF) & ~FW_BLC_SELF_EN); 3806 I915_READ(FW_BLC_SELF) & ~FW_BLC_SELF_EN);
3807 3807
3808 DRM_DEBUG("Setting FIFO watermarks - A: plane=%d, cursor=%d, B: plane=%d, cursor=%d, SR: plane=%d, cursor=%d\n", 3808 DRM_DEBUG_KMS("Setting FIFO watermarks - A: plane=%d, cursor=%d, B: plane=%d, cursor=%d, SR: plane=%d, cursor=%d\n",
3809 planea_wm, cursora_wm, 3809 planea_wm, cursora_wm,
3810 planeb_wm, cursorb_wm, 3810 planeb_wm, cursorb_wm,
3811 plane_sr, cursor_sr); 3811 plane_sr, cursor_sr);
3812 3812
3813 I915_WRITE(DSPFW1, 3813 I915_WRITE(DSPFW1,
3814 (plane_sr << DSPFW_SR_SHIFT) | 3814 (plane_sr << DSPFW_SR_SHIFT) |
@@ -3849,11 +3849,12 @@ static void i965_update_wm(struct drm_device *dev)
3849 entries = (((sr_latency_ns / line_time_us) + 1000) / 1000) * 3849 entries = (((sr_latency_ns / line_time_us) + 1000) / 1000) *
3850 pixel_size * hdisplay; 3850 pixel_size * hdisplay;
3851 entries = DIV_ROUND_UP(entries, I915_FIFO_LINE_SIZE); 3851 entries = DIV_ROUND_UP(entries, I915_FIFO_LINE_SIZE);
3852 DRM_DEBUG("self-refresh entries: %d\n", entries);
3853 srwm = I965_FIFO_SIZE - entries; 3852 srwm = I965_FIFO_SIZE - entries;
3854 if (srwm < 0) 3853 if (srwm < 0)
3855 srwm = 1; 3854 srwm = 1;
3856 srwm &= 0x1ff; 3855 srwm &= 0x1ff;
3856 DRM_DEBUG_KMS("self-refresh entries: %d, wm: %d\n",
3857 entries, srwm);
3857 3858
3858 entries = (((sr_latency_ns / line_time_us) + 1000) / 1000) * 3859 entries = (((sr_latency_ns / line_time_us) + 1000) / 1000) *
3859 pixel_size * 64; 3860 pixel_size * 64;