aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-04-17 23:35:52 -0400
committerDave Airlie <airlied@redhat.com>2011-04-28 00:53:21 -0400
commitbbb0aef5cfe95fe9b51a7eeba4a440b69037b01f (patch)
tree858fdc7ee2b358827888f278fdfd0dddfbacc64b /drivers/gpu/drm/i915/intel_display.c
parent5ad3d8831f0c97257460c11ddcc1cc0466c762d4 (diff)
drm: Verify debug message arguments
Add __attribute__((format (printf, 4, 5))) to drm_ut_debug_printk and fix fallout. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e522c702b04e..21a7e70feacc 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3497,11 +3497,11 @@ static unsigned long intel_calculate_wm(unsigned long clock_in_khz,
3497 1000; 3497 1000;
3498 entries_required = DIV_ROUND_UP(entries_required, wm->cacheline_size); 3498 entries_required = DIV_ROUND_UP(entries_required, wm->cacheline_size);
3499 3499
3500 DRM_DEBUG_KMS("FIFO entries required for mode: %d\n", entries_required); 3500 DRM_DEBUG_KMS("FIFO entries required for mode: %ld\n", entries_required);
3501 3501
3502 wm_size = fifo_size - (entries_required + wm->guard_size); 3502 wm_size = fifo_size - (entries_required + wm->guard_size);
3503 3503
3504 DRM_DEBUG_KMS("FIFO watermark level: %d\n", wm_size); 3504 DRM_DEBUG_KMS("FIFO watermark level: %ld\n", wm_size);
3505 3505
3506 /* Don't promote wm_size to unsigned... */ 3506 /* Don't promote wm_size to unsigned... */
3507 if (wm_size > (long)wm->max_wm) 3507 if (wm_size > (long)wm->max_wm)
@@ -3823,13 +3823,13 @@ static bool g4x_check_srwm(struct drm_device *dev,
3823 display_wm, cursor_wm); 3823 display_wm, cursor_wm);
3824 3824
3825 if (display_wm > display->max_wm) { 3825 if (display_wm > display->max_wm) {
3826 DRM_DEBUG_KMS("display watermark is too large(%d), disabling\n", 3826 DRM_DEBUG_KMS("display watermark is too large(%d/%ld), disabling\n",
3827 display_wm, display->max_wm); 3827 display_wm, display->max_wm);
3828 return false; 3828 return false;
3829 } 3829 }
3830 3830
3831 if (cursor_wm > cursor->max_wm) { 3831 if (cursor_wm > cursor->max_wm) {
3832 DRM_DEBUG_KMS("cursor watermark is too large(%d), disabling\n", 3832 DRM_DEBUG_KMS("cursor watermark is too large(%d/%ld), disabling\n",
3833 cursor_wm, cursor->max_wm); 3833 cursor_wm, cursor->max_wm);
3834 return false; 3834 return false;
3835 } 3835 }