Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu/gfx10: disable gfxoff when reading rlc clock

Otherwise we readback all ones. Fixes rlc counter
readback while gfxoff is active.

Reviewed-by: Xiaojie Yuan <xiaojie.yuan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org

+2
+2
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
··· 3923 3923 { 3924 3924 uint64_t clock; 3925 3925 3926 + amdgpu_gfx_off_ctrl(adev, false); 3926 3927 mutex_lock(&adev->gfx.gpu_clock_mutex); 3927 3928 WREG32_SOC15(GC, 0, mmRLC_CAPTURE_GPU_CLOCK_COUNT, 1); 3928 3929 clock = (uint64_t)RREG32_SOC15(GC, 0, mmRLC_GPU_CLOCK_COUNT_LSB) | 3929 3930 ((uint64_t)RREG32_SOC15(GC, 0, mmRLC_GPU_CLOCK_COUNT_MSB) << 32ULL); 3930 3931 mutex_unlock(&adev->gfx.gpu_clock_mutex); 3932 + amdgpu_gfx_off_ctrl(adev, true); 3931 3933 return clock; 3932 3934 } 3933 3935