summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni.dodonov@intel.com>2011-11-09 12:44:54 -0200
committerEugeni Dodonov <eugeni.dodonov@intel.com>2011-11-09 12:44:54 -0200
commit92530bce1350720efbbdb989316b7e34a1c15197 (patch)
tree15640cf767b425aa5f55e2c20026e6a59e83eb52 /tools
parentc7666c140e53c3d60fdf6d1b341157dc89b2ed9a (diff)
intel_gpu_top: search in different possible debugfs locationsintel-gpu-top
The known ones are /sys/kernel/debug/ and /debug/ Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/intel_gpu_top.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c
index 14f333e..a0707b6 100644
--- a/tools/intel_gpu_top.c
+++ b/tools/intel_gpu_top.c
@@ -165,6 +165,7 @@ static void
power_stat_init(struct powerdata *power)
{
#ifdef __linux__
+ /* detect the correct location for the acpi/battery and i915_emon_status */
int i, ret;
power->battery_file = (char *)malloc(FILENAME_MAX);
for (i=0, ret=-1; i < 16; i++) {
@@ -178,12 +179,16 @@ power_stat_init(struct powerdata *power)
power->battery_file = NULL;
}
-
power->battery_file_ext = (char *)malloc(FILENAME_MAX);
for (i=0, ret=-1; i < 16; i++) {
+ /* Try in /sys/kernel/debug */
snprintf(power->battery_file_ext, FILENAME_MAX, "/sys/kernel/debug/dri/%d/i915_emon_status", i);
if ((ret = access(power->battery_file_ext, R_OK)) == 0)
break;
+ /* Try in /debug */
+ snprintf(power->battery_file_ext, FILENAME_MAX, "/debug/dri/%d/i915_emon_status", i);
+ if ((ret = access(power->battery_file_ext, R_OK)) == 0)
+ break;
}
if (ret < 0) {
free(power->battery_file_ext);