Commit 9fbd3088 authored Mar 24, 2021 by Rob Clark

drm/msm: Fix a5xx/a6xx timestamps



They were reading a counter that was configured to ALWAYS_COUNT (ie.
cycles that the GPU is doing something) rather than ALWAYS_ON.  This
isn't the thing that userspace is looking for.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Acked-by: Jordan Crouse <jordan@cosmicpenguin.net>
Message-Id: <20210325012358.1759770-2-robdclark@gmail.com>
Signed-off-by: Rob Clark <robdclark@chromium.org>

parent 2b0b219e

drivers/gpu/drm/msm/adreno/a5xx_gpu.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1386,8 +1386,8 @@ static int a5xx_pm_suspend(struct msm_gpu *gpu)

		static int a5xx_get_timestamp(struct msm_gpu gpu, uint64_t value)
		{
		*value = gpu_read64(gpu, REG_A5XX_RBBM_PERFCTR_CP_0_LO,
		REG_A5XX_RBBM_PERFCTR_CP_0_HI);
		*value = gpu_read64(gpu, REG_A5XX_RBBM_ALWAYSON_COUNTER_LO,
		REG_A5XX_RBBM_ALWAYSON_COUNTER_HI);

		return 0;
		}

drivers/gpu/drm/msm/adreno/a6xx_gpu.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1228,8 +1228,8 @@ static int a6xx_get_timestamp(struct msm_gpu gpu, uint64_t value)
		/* Force the GPU power on so we can read this register */
		a6xx_gmu_set_oob(&a6xx_gpu->gmu, GMU_OOB_PERFCOUNTER_SET);

		*value = gpu_read64(gpu, REG_A6XX_RBBM_PERFCTR_CP_0_LO,
		REG_A6XX_RBBM_PERFCTR_CP_0_HI);
		*value = gpu_read64(gpu, REG_A6XX_CP_ALWAYS_ON_COUNTER_LO,
		REG_A6XX_CP_ALWAYS_ON_COUNTER_HI);

		a6xx_gmu_clear_oob(&a6xx_gpu->gmu, GMU_OOB_PERFCOUNTER_SET);
		mutex_unlock(&perfcounter_oob);