commit 4f451464c04012d8825465a2031cc1090952f71c
author Linux Build Service Account <lnxbuild@quicinc.com> Tue Jun 13 03:46:28 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jun 13 03:46:28 2017 -0700
tree afa24f50f220f1e035fea7b6f0dfcf2fc88e2731
parent 9c48fc49515e2387a8c6c27933d97098bed8bb57
parent 07550733979e8b31614e18c7eddcac8a78270145

Merge "msm: kgsl: Converts A6XX power counter value to microseconds"

drivers/gpu/msm/adreno.c

diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c
index f581cff..3672273 100644
--- a/drivers/gpu/msm/adreno.c
+++ b/drivers/gpu/msm/adreno.c
@@ -2855,8 +2855,14 @@
 			gpu_busy += adj;
 		}
 
-		stats->busy_time = adreno_ticks_to_us(gpu_busy,
-			kgsl_pwrctrl_active_freq(pwr));
+		if (kgsl_gmu_isenabled(device)) {
+			/* clock sourced from XO */
+			stats->busy_time = gpu_busy * 10 / 192;
+		} else {
+			/* clock sourced from GFX3D */
+			stats->busy_time = adreno_ticks_to_us(gpu_busy,
+				kgsl_pwrctrl_active_freq(pwr));
+		}
 	}
 
 	if (device->pwrctrl.bus_control) {