summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Paauwe <bob.j.paauwe@intel.com>2015-12-03 16:28:00 -0800
committerImre Deak <imre.deak@intel.com>2015-12-04 22:26:06 +0200
commit8b22e051e8306a8ee5e78862b403f01cc5b683ec (patch)
treefd0c59e65cf3e3c4a603e1ee2c6bcbe2d003d629
parent6cf72724e225524cd0a4352ba829ffc578f40a4d (diff)
igt/pm_rps: current freq < user specified min is not a fail (v3)
Since commit commit aed242ff7ebb697e4dff912bd4dc7ec7192f7581 Author: Chris Wilson <chris@chris-wilson.co.uk> Date: Wed Mar 18 09:48:21 2015 +0000 drm/i915: Relax RPS contraints to allows setting minfreq on idle it is now possible that the current frequency will drop be the user specified minimum frequency to the "idle" or RPn frequency. Update the pm_rps tests to reflect that droping below the user specified minimum is no longer considered a failure. v2: Add check RPn <= current freq. (Me) v3: Use RPn instead of MIN frequency in idle check (Imre) Signed-off-by: Bob Paauwe <bob.j.paauwe@intel.com> Reviewed-by: Imre Deak <imre.deak@intel.com>
-rw-r--r--tests/pm_rps.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/pm_rps.c b/tests/pm_rps.c
index 74f08f47..9d054fdb 100644
--- a/tests/pm_rps.c
+++ b/tests/pm_rps.c
@@ -146,7 +146,7 @@ static void checkit(const int *freqs)
{
igt_assert_lte(freqs[MIN], freqs[MAX]);
igt_assert_lte(freqs[CUR], freqs[MAX]);
- igt_assert_lte(freqs[MIN], freqs[CUR]);
+ igt_assert_lte(freqs[RPn], freqs[CUR]);
igt_assert_lte(freqs[RPn], freqs[MIN]);
igt_assert_lte(freqs[MAX], freqs[RP0]);
igt_assert_lte(freqs[RP1], freqs[RP0]);
@@ -472,14 +472,14 @@ static void idle_check(void)
read_freqs(freqs);
dump(freqs);
checkit(freqs);
- if (freqs[CUR] == freqs[MIN])
+ if (freqs[CUR] == freqs[RPn])
break;
usleep(1000 * IDLE_WAIT_TIMESTEP_MSEC);
wait += IDLE_WAIT_TIMESTEP_MSEC;
} while (wait < IDLE_WAIT_TIMEOUT_MSEC);
- igt_assert_eq(freqs[CUR], freqs[MIN]);
- igt_debug("Required %d msec to reach cur=min\n", wait);
+ igt_assert_eq(freqs[CUR], freqs[RPn]);
+ igt_debug("Required %d msec to reach cur=idle\n", wait);
}
#define LOADED_WAIT_TIMESTEP_MSEC 100