drm/i915/selftests: Show the RC6 residency on parking failure

Include the current RC6 residency counter in the error message, so that
if we fail to park and manually enter RC6 we can see if the counter has
a particularly suspect value (such as 0).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Andi Shyti <andi.shyti@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200123145755.1420622-1-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/gt/selftest_rc6.c b/drivers/gpu/drm/i915/gt/selftest_rc6.c
index 8cc55a0e9e068d8e94a0de5dd8bbea52391c58e0..5f7e2dcf5686501be7b7d85bf2eb41c12f25c293 100644 (file)
--- a/drivers/gpu/drm/i915/gt/selftest_rc6.c
+++ b/drivers/gpu/drm/i915/gt/selftest_rc6.c
@@ -56,9 +56,10 @@ int live_rc6_manual(void *arg)
        res[1] = intel_rc6_residency_ns(rc6, GEN6_GT_GFX_RC6);
 
        if (res[1] == res[0]) {
-               pr_err("Did not enter RC6! RC6_STATE=%08x, RC6_CONTROL=%08x\n",
+               pr_err("Did not enter RC6! RC6_STATE=%08x, RC6_CONTROL=%08x, residency=%lld\n",
                       intel_uncore_read_fw(gt->uncore, GEN6_RC_STATE),
-                      intel_uncore_read_fw(gt->uncore, GEN6_RC_CONTROL));
+                      intel_uncore_read_fw(gt->uncore, GEN6_RC_CONTROL),
+                      res[0]);
                err = -EINVAL;
        }