From: Alex Sierra <[email protected]> Function get_gpu_clock_counter missing for smuio v14_0_3
Signed-off-by: Alex Sierra <[email protected]> Reviewed-by: Mukul Joshi <[email protected]> Signed-off-by: Alex Deucher <[email protected]> --- drivers/gpu/drm/amd/amdgpu/smuio_v14_0_3.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/smuio_v14_0_3.c b/drivers/gpu/drm/amd/amdgpu/smuio_v14_0_3.c index 804b7458b0661..f48ef572d9b41 100644 --- a/drivers/gpu/drm/amd/amdgpu/smuio_v14_0_3.c +++ b/drivers/gpu/drm/amd/amdgpu/smuio_v14_0_3.c @@ -44,6 +44,25 @@ static void smuio_v14_0_3_update_rom_clock_gating(struct amdgpu_device *adev, bo return; } +static u64 smuio_v14_0_3_get_gpu_clock_counter(struct amdgpu_device *adev) +{ + u64 clock; + u64 clock_counter_lo, clock_counter_hi_pre, clock_counter_hi_after; + + preempt_disable(); + clock_counter_hi_pre = (u64)RREG32_SOC15(SMUIO, 0, regGOLDEN_TSC_COUNT_UPPER); + clock_counter_lo = (u64)RREG32_SOC15(SMUIO, 0, regGOLDEN_TSC_COUNT_LOWER); + /* the clock counter may be udpated during polling the counters */ + clock_counter_hi_after = (u64)RREG32_SOC15(SMUIO, 0, regGOLDEN_TSC_COUNT_UPPER); + if (clock_counter_hi_pre != clock_counter_hi_after) + clock_counter_lo = (u64)RREG32_SOC15(SMUIO, 0, regGOLDEN_TSC_COUNT_LOWER); + preempt_enable(); + + clock = clock_counter_lo | (clock_counter_hi_after << 32ULL); + + return clock; +} + static void smuio_v14_0_3_get_clock_gating_state(struct amdgpu_device *adev, u64 *flags) { u32 data; @@ -184,6 +203,7 @@ static bool smuio_v14_0_3_is_custom_hbm_supported(struct amdgpu_device *adev) const struct amdgpu_smuio_funcs smuio_v14_0_3_funcs = { .get_rom_index_offset = smuio_v14_0_3_get_rom_index_offset, .get_rom_data_offset = smuio_v14_0_3_get_rom_data_offset, + .get_gpu_clock_counter = smuio_v14_0_3_get_gpu_clock_counter, .get_die_id = smuio_v14_0_3_get_die_id, .get_socket_id = smuio_v14_0_3_get_socket_id, .is_host_gpu_xgmi_supported = smuio_v14_0_3_is_host_gpu_xgmi_supported, -- 2.51.0
