Skip to content

Commit

Permalink
drm/i915: Use DEBUG_KMS for the self-refresh watermarks
Browse files Browse the repository at this point in the history
For consistency and segregation from the noisy DRM_DEBUG().

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
  • Loading branch information
Chris Wilson committed Feb 7, 2011
1 parent b6f7833 commit 308977a
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) |
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 308977a

Please sign in to comment.