From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Intel-gfx@lists.freedesktop.org
Subject: [PATCH 6/9] drm/i915: Log watermark latencies on a single line per plane
Date: Wed, 27 Apr 2016 11:06:59 +0100 [thread overview]
Message-ID: <1461751622-26927-7-git-send-email-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <1461751622-26927-1-git-send-email-tvrtko.ursulin@linux.intel.com>
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Compacts debug logging a bit so instead of:
[drm:intel_print_wm_latency] Primary WM0 latency 20 (2.0 usec)
[drm:intel_print_wm_latency] Primary WM1 latency 50 (25.0 usec)
[drm:intel_print_wm_latency] Primary WM2 latency 90 (45.0 usec)
[drm:intel_print_wm_latency] Primary WM3 latency 130 (65.0 usec)
[drm:intel_print_wm_latency] Primary WM4 latency 160 (80.0 usec)
[drm:intel_print_wm_latency] Sprite WM0 latency 20 (2.0 usec)
[drm:intel_print_wm_latency] Sprite WM1 latency 50 (25.0 usec)
[drm:intel_print_wm_latency] Sprite WM2 latency 90 (45.0 usec)
[drm:intel_print_wm_latency] Sprite WM3 latency 130 (65.0 usec)
[drm:intel_print_wm_latency] Sprite WM4 latency 160 (80.0 usec)
[drm:intel_print_wm_latency] Cursor WM0 latency 20 (2.0 usec)
[drm:intel_print_wm_latency] Cursor WM1 latency 50 (25.0 usec)
[drm:intel_print_wm_latency] Cursor WM2 latency 90 (45.0 usec)
[drm:intel_print_wm_latency] Cursor WM3 latency 130 (65.0 usec)
[drm:intel_print_wm_latency] Cursor WM4 latency 160 (80.0 usec)
We get:
[drm:intel_print_wm_latency] Primary plane latencies [2.0us (20), 25.0us (50), 45.0us (90), 65.0us (130), 80.0us (160)]
[drm:intel_print_wm_latency] Sprite plane latencies [2.0us (20), 25.0us (50), 45.0us (90), 65.0us (130), 80.0us (160)]
[drm:intel_print_wm_latency] Cursor plane latencies [2.0us (20), 25.0us (50), 45.0us (90), 65.0us (130), 80.0us (160)]
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/intel_pm.c | 31 ++++++++++++++++++++++---------
1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 695a464a5e64..23589eedf396 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -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,
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-04-27 10:07 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-27 10:06 [PATCH 0/9] A little bit of KMS debug logging tidy Tvrtko Ursulin
2016-04-27 10:06 ` [PATCH 1/9] drm: Add drm_mode_debug_printmodeline_raw Tvrtko Ursulin
2016-04-27 12:35 ` Jani Nikula
2016-04-27 12:58 ` Tvrtko Ursulin
2016-04-27 10:06 ` [PATCH 2/9] drm: Recognize invalid (all-zero) modes in drm_mode_debug_printmodeline(_raw) Tvrtko Ursulin
2016-04-27 10:06 ` [PATCH 3/9] drm/i915: Compact modes in intel_dump_pipe_config Tvrtko Ursulin
2016-04-27 12:37 ` Jani Nikula
2016-04-27 10:06 ` [PATCH 4/9] drm/i915: Tidy planes and scaler info " Tvrtko Ursulin
2016-04-27 10:06 ` [PATCH 5/9] drm/i915: Compact intel_dump_pipe_config some more Tvrtko Ursulin
2016-04-27 10:06 ` Tvrtko Ursulin [this message]
2016-04-27 10:07 ` [PATCH 7/9] drm/i915: Compact display clock logging Tvrtko Ursulin
2016-04-27 10:07 ` [PATCH 8/9] drm/i915: Print DisplayPort clocks on a single line Tvrtko Ursulin
2016-04-27 10:07 ` [PATCH 9/9] drm: Quiet down drm_mode_getconnector Tvrtko Ursulin
2016-04-28 8:54 ` Daniel Vetter
2016-04-27 10:54 ` [PATCH 0/9] A little bit of KMS debug logging tidy Jani Nikula
2016-04-27 11:26 ` Tvrtko Ursulin
2016-04-27 11:57 ` ✗ Fi.CI.BAT: warning for " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461751622-26927-7-git-send-email-tvrtko.ursulin@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=Intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.