Skip to content

Commit 63b81a3

Browse files
sanirban-999Andi Shyti
authored andcommitted
drm/i915/selftests: Implement frequency logging for energy reading validation
Add RC6 & RC0 frequency printing to ensure accurate energy readings aimed at addressing GPU energy leaks and power measurement failures. Also update sleep time for RC6 mode to match RC0. v2: - Improved commit message. v3: - Used pr_err log to display frequency (Anshuman) - Sorted headers alphabetically (Sai Teja) v4: - Improved commit message. - Fix pr_err log (Sai Teja) v5: - Add error & debug logging for RC0 power and frequency checks (Anshuman) v6: - Modify debug logging for RC0 power and frequency checks (Sai Teja) v7: - Use pr_debug if RC0 power isn't measured but frequency is (Anshuman) - Improved commit message (Badal) - Change API to read actual frequency without applying forcewake (Badal) - Update sleep time for RC6 mode (Anshuman) Signed-off-by: Sk Anirban <[email protected]> Reviewed-by: Sai Teja Pottumuttu <[email protected]> Reviewed-by: Badal Nilawar <[email protected]> Reviewed-by: Andi Shyti <[email protected]> Signed-off-by: Andi Shyti <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 512eadb commit 63b81a3

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

drivers/gpu/drm/i915/gt/selftest_rc6.c

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "intel_gpu_commands.h"
99
#include "intel_gt_requests.h"
1010
#include "intel_ring.h"
11+
#include "intel_rps.h"
1112
#include "selftest_rc6.h"
1213

1314
#include "selftests/i915_random.h"
@@ -38,6 +39,9 @@ int live_rc6_manual(void *arg)
3839
ktime_t dt;
3940
u64 res[2];
4041
int err = 0;
42+
u32 rc0_freq = 0;
43+
u32 rc6_freq = 0;
44+
struct intel_rps *rps = &gt->rps;
4145

4246
/*
4347
* Our claim is that we can "encourage" the GPU to enter rc6 at will.
@@ -66,6 +70,7 @@ int live_rc6_manual(void *arg)
6670
rc0_power = librapl_energy_uJ() - rc0_power;
6771
dt = ktime_sub(ktime_get(), dt);
6872
res[1] = rc6_residency(rc6);
73+
rc0_freq = intel_rps_read_actual_frequency_fw(rps);
6974
if ((res[1] - res[0]) >> 10) {
7075
pr_err("RC6 residency increased by %lldus while disabled for 1000ms!\n",
7176
(res[1] - res[0]) >> 10);
@@ -77,7 +82,11 @@ int live_rc6_manual(void *arg)
7782
rc0_power = div64_u64(NSEC_PER_SEC * rc0_power,
7883
ktime_to_ns(dt));
7984
if (!rc0_power) {
80-
pr_err("No power measured while in RC0\n");
85+
if (rc0_freq)
86+
pr_debug("No power measured while in RC0! GPU Freq: %u in RC0\n",
87+
rc0_freq);
88+
else
89+
pr_err("No power and freq measured while in RC0\n");
8190
err = -EINVAL;
8291
goto out_unlock;
8392
}
@@ -90,7 +99,8 @@ int live_rc6_manual(void *arg)
9099
intel_uncore_forcewake_flush(rc6_to_uncore(rc6), FORCEWAKE_ALL);
91100
dt = ktime_get();
92101
rc6_power = librapl_energy_uJ();
93-
msleep(100);
102+
msleep(1000);
103+
rc6_freq = intel_rps_read_actual_frequency_fw(rps);
94104
rc6_power = librapl_energy_uJ() - rc6_power;
95105
dt = ktime_sub(ktime_get(), dt);
96106
res[1] = rc6_residency(rc6);
@@ -108,7 +118,8 @@ int live_rc6_manual(void *arg)
108118
pr_info("GPU consumed %llduW in RC0 and %llduW in RC6\n",
109119
rc0_power, rc6_power);
110120
if (2 * rc6_power > rc0_power) {
111-
pr_err("GPU leaked energy while in RC6!\n");
121+
pr_err("GPU leaked energy while in RC6! GPU Freq: %u in RC6 and %u in RC0\n",
122+
rc6_freq, rc0_freq);
112123
err = -EINVAL;
113124
goto out_unlock;
114125
}

0 commit comments

Comments
 (0)