|
@@ -3497,11 +3497,11 @@ static unsigned long intel_calculate_wm(unsigned long clock_in_khz,
|
|
|
1000;
|
|
|
entries_required = DIV_ROUND_UP(entries_required, wm->cacheline_size);
|
|
|
|
|
|
- DRM_DEBUG_KMS("FIFO entries required for mode: %d\n", entries_required);
|
|
|
+ DRM_DEBUG_KMS("FIFO entries required for mode: %ld\n", entries_required);
|
|
|
|
|
|
wm_size = fifo_size - (entries_required + wm->guard_size);
|
|
|
|
|
|
- DRM_DEBUG_KMS("FIFO watermark level: %d\n", wm_size);
|
|
|
+ DRM_DEBUG_KMS("FIFO watermark level: %ld\n", wm_size);
|
|
|
|
|
|
/* Don't promote wm_size to unsigned... */
|
|
|
if (wm_size > (long)wm->max_wm)
|
|
@@ -3823,13 +3823,13 @@ static bool g4x_check_srwm(struct drm_device *dev,
|
|
|
display_wm, cursor_wm);
|
|
|
|
|
|
if (display_wm > display->max_wm) {
|
|
|
- DRM_DEBUG_KMS("display watermark is too large(%d), disabling\n",
|
|
|
+ DRM_DEBUG_KMS("display watermark is too large(%d/%ld), disabling\n",
|
|
|
display_wm, display->max_wm);
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
if (cursor_wm > cursor->max_wm) {
|
|
|
- DRM_DEBUG_KMS("cursor watermark is too large(%d), disabling\n",
|
|
|
+ DRM_DEBUG_KMS("cursor watermark is too large(%d/%ld), disabling\n",
|
|
|
cursor_wm, cursor->max_wm);
|
|
|
return false;
|
|
|
}
|