@@ -2179,15 +2179,26 @@ static void intel_print_wm_latency(struct drm_device *dev,
const uint16_t wm[8])
{
int level, max_level = ilk_wm_max_level(dev);
+ bool error = false;
+ static const char *wm_msg = "%s plane latencies [";
for (level = 0; level <= max_level; level++) {
- unsigned int latency = wm[level];
-
- if (latency == 0) {
- DRM_ERROR("%s WM%d latency not provided\n",
- name, level);
- continue;
+ if (wm[level] == 0) {
+ error = true;
+ break;
}
+ }
+
+ if (error)
+ DRM_ERROR(wm_msg, name);
+ else
+ DRM_DEBUG_KMS(wm_msg, name);
+
+ if (!error && !(drm_debug && DRM_UT_KMS))
+ return;
+
+ for (level = 0; level <= max_level; level++) {
+ unsigned int latency = wm[level];
/*
* - latencies are in us on gen9.
@@ -2198,10 +2209,12 @@ static void intel_print_wm_latency(struct drm_device *dev,
else if (level > 0)
latency *= 5;
- DRM_DEBUG_KMS("%s WM%d latency %u (%u.%u usec)\n",
- name, level, wm[level],
- latency / 10, latency % 10);
+ if (level > 0)
+ printk(", ");
+ printk("%u.%uus (%u)", latency / 10, latency % 10, wm[level]);
}
+
+ printk("]\n");
}
static bool ilk_increase_wm_latency(struct drm_i915_private *dev_priv,