[Intel-gfx] [PATCH 5/6] drm/i915/selftests: Test RING_TIMESTAMP on gen4/5

[Ville Syrjala]

From: Ville Syrjälä <ville.syrj...@linux.intel.com>

Now that we actually know the cs timestamp frequency on gen4/5
let's run the corresponding test.

On g4x/ilk we must read the udw of the 64bit timestamp
register. Details in {g4x,gen5)_read_clock_frequency().

The one extra caveat is that on i965 (or at least CL, don't
recall if I ever tested on BW) we must read the register
twice to get an up to date value. For some unknown reason
the first read tends to return a stale value.

Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
---
 drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 36 ++++++++++--------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/selftest_gt_pm.c 
b/drivers/gpu/drm/i915/gt/selftest_gt_pm.c
index be94f863bdef..b46425aeb2f0 100644
--- a/drivers/gpu/drm/i915/gt/selftest_gt_pm.c
+++ b/drivers/gpu/drm/i915/gt/selftest_gt_pm.c
@@ -36,6 +36,19 @@ static int cmp_u32(const void *A, const void *B)
                return 0;
 }
 
+static u32 read_timestamp(struct intel_engine_cs *engine)
+{
+       struct drm_i915_private *i915 = engine->i915;
+
+       /* On i965 the first read tends to give a stale value */
+       ENGINE_READ_FW(engine, RING_TIMESTAMP);
+
+       if (GRAPHICS_VER(i915) == 5 || IS_G4X(i915))
+               return ENGINE_READ_FW(engine, RING_TIMESTAMP_UDW);
+       else
+               return ENGINE_READ_FW(engine, RING_TIMESTAMP);
+}
+
 static void measure_clocks(struct intel_engine_cs *engine,
                           u32 *out_cycles, ktime_t *out_dt)
 {
@@ -45,13 +58,13 @@ static void measure_clocks(struct intel_engine_cs *engine,
 
        for (i = 0; i < 5; i++) {
                local_irq_disable();
-               cycles[i] = -ENGINE_READ_FW(engine, RING_TIMESTAMP);
+               cycles[i] = -read_timestamp(engine);
                dt[i] = ktime_get();
 
                udelay(1000);
 
                dt[i] = ktime_sub(ktime_get(), dt[i]);
-               cycles[i] += ENGINE_READ_FW(engine, RING_TIMESTAMP);
+               cycles[i] += read_timestamp(engine);
                local_irq_enable();
        }
 
@@ -78,25 +91,6 @@ static int live_gt_clocks(void *arg)
        if (GRAPHICS_VER(gt->i915) < 4) /* Any CS_TIMESTAMP? */
                return 0;
 
-       if (GRAPHICS_VER(gt->i915) == 5)
-               /*
-                * XXX CS_TIMESTAMP low dword is dysfunctional?
-                *
-                * Ville's experiments indicate the high dword still works,
-                * but at a correspondingly reduced frequency.
-                */
-               return 0;
-
-       if (GRAPHICS_VER(gt->i915) == 4)
-               /*
-                * XXX CS_TIMESTAMP appears gibberish
-                *
-                * Ville's experiments indicate that it mostly appears 'stuck'
-                * in that we see the register report the same cycle count
-                * for a couple of reads.
-                */
-               return 0;
-
        intel_gt_pm_get(gt);
        intel_uncore_forcewake_get(gt->uncore, FORCEWAKE_ALL);
 
-- 
2.37.4