From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 2 Feb 2011 10:41:20 +0000 (+0000)
Subject: drm/i915: Use DEBUG_KMS for the self-refresh watermarks
X-Git-Tag: v2.6.39-rc1~458^2~9^2~32
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=308977ac03117706c342099a40919b3da2667cce;p=~emulex%2Finfiniband.git

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>
---

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e1872573571..a4acef6c147 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)
 		I915_WRITE(FW_BLC_SELF,
 			   I915_READ(FW_BLC_SELF) & ~FW_BLC_SELF_EN);
 
-	DRM_DEBUG("Setting FIFO watermarks - A: plane=%d, cursor=%d, B: plane=%d, cursor=%d, SR: plane=%d, cursor=%d\n",
-		  planea_wm, cursora_wm,
-		  planeb_wm, cursorb_wm,
-		  plane_sr, cursor_sr);
+	DRM_DEBUG_KMS("Setting FIFO watermarks - A: plane=%d, cursor=%d, B: plane=%d, cursor=%d, SR: plane=%d, cursor=%d\n",
+		      planea_wm, cursora_wm,
+		      planeb_wm, cursorb_wm,
+		      plane_sr, cursor_sr);
 
 	I915_WRITE(DSPFW1,
 		   (plane_sr << DSPFW_SR_SHIFT) |
@@ -3849,11 +3849,12 @@ static void i965_update_wm(struct drm_device *dev)
 		entries = (((sr_latency_ns / line_time_us) + 1000) / 1000) *
 			pixel_size * hdisplay;
 		entries = DIV_ROUND_UP(entries, I915_FIFO_LINE_SIZE);
-		DRM_DEBUG("self-refresh entries: %d\n", entries);
 		srwm = I965_FIFO_SIZE - entries;
 		if (srwm < 0)
 			srwm = 1;
 		srwm &= 0x1ff;
+		DRM_DEBUG_KMS("self-refresh entries: %d, wm: %d\n",
+			      entries, srwm);
 
 		entries = (((sr_latency_ns / line_time_us) + 1000) / 1000) *
 			pixel_size * 64;