drm/amdgpu/gfx11: update gpu_clock_counter logic
Subsystems (2)
Alex Deucher
maintainerPATCH v2 1/1 drm/amdgpu/gfx11: update gpu_clock_counter logic
This code was written prior to previous updates to this logic for other chips. The RSC registers are part of SMUIO which is an always on block so there is no need to disable gfxoff. Additionally add the carryover and preemption checks.
v2: rebase
--- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +7 -4
@@ -4673,24 +4673,27 @@ static uint64_t gfx_v11_0_get_gpu_clock_counter(struct amdgpu_device *adev)uint64_t clock;uint64_t clock_counter_lo, clock_counter_hi_pre, clock_counter_hi_after; -amdgpu_gfx_off_ctrl (adev, false); -mutex_lock (&adev->gfx.gpu_clock_mutex);if (amdgpu_sriov_vf (adev)) { +amdgpu_gfx_off_ctrl (adev, false); +mutex_lock (&adev->gfx.gpu_clock_mutex); clock_counter_hi_pre = (uint64_t )RREG32_SOC15 (GC ,0 , regCP_MES_MTIME_HI); clock_counter_lo = (uint64_t )RREG32_SOC15 (GC ,0 , regCP_MES_MTIME_LO); clock_counter_hi_after = (uint64_t )RREG32_SOC15 (GC ,0 , regCP_MES_MTIME_HI);if (clock_counter_hi_pre != clock_counter_hi_after) clock_counter_lo = (uint64_t )RREG32_SOC15 (GC ,0 , regCP_MES_MTIME_LO); +mutex_unlock (&adev->gfx.gpu_clock_mutex); +amdgpu_gfx_off_ctrl (adev, true); }else { +preempt_disable (); clock_counter_hi_pre = (uint64_t )RREG32_SOC15 (SMUIO ,0 , regGOLDEN_TSC_COUNT_UPPER); clock_counter_lo = (uint64_t )RREG32_SOC15 (SMUIO ,0 , regGOLDEN_TSC_COUNT_LOWER); clock_counter_hi_after = (uint64_t )RREG32_SOC15 (SMUIO ,0 , regGOLDEN_TSC_COUNT_UPPER);if (clock_counter_hi_pre != clock_counter_hi_after) clock_counter_lo = (uint64_t )RREG32_SOC15 (SMUIO ,0 , regGOLDEN_TSC_COUNT_LOWER); +preempt_enable (); } clock = clock_counter_lo | (clock_counter_hi_after <<32ULL ); -mutex_unlock (&adev->gfx.gpu_clock_mutex); -amdgpu_gfx_off_ctrl (adev, true); +return clock; }
Signature · 1 line
2.39.2
Ping?
Quoted 53 lines · Alex Deucher
This code was written prior to previous updates to this logic for other chips. The RSC registers are part of SMUIO which is an always on block so there is no need to disable gfxoff. Additionally add the carryover and preemption checks.
v2: rebase
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +7
-5@@ -4673,24 +4673,27 @@ static uint64_t gfx_v11_0_get_gpu_clock_counter(struct amdgpu_device *adev)uint64_t clock;uint64_t clock_counter_lo, clock_counter_hi_pre, clock_counter_hi_after; -amdgpu_gfx_off_ctrl (adev, false); -mutex_lock (&adev->gfx.gpu_clock_mutex);if (amdgpu_sriov_vf (adev)) { +amdgpu_gfx_off_ctrl (adev, false); +mutex_lock (&adev->gfx.gpu_clock_mutex); clock_counter_hi_pre = (uint64_t )RREG32_SOC15 (GC ,0 , regCP_MES_MTIME_HI); clock_counter_lo = (uint64_t )RREG32_SOC15 (GC ,0 , regCP_MES_MTIME_LO); clock_counter_hi_after = (uint64_t )RREG32_SOC15 (GC ,0 , regCP_MES_MTIME_HI);if (clock_counter_hi_pre != clock_counter_hi_after) clock_counter_lo = (uint64_t )RREG32_SOC15 (GC ,0 , regCP_MES_MTIME_LO); +mutex_unlock (&adev->gfx.gpu_clock_mutex); +amdgpu_gfx_off_ctrl (adev, true); }else { +preempt_disable (); clock_counter_hi_pre = (uint64_t )RREG32_SOC15 (SMUIO ,0 , regGOLDEN_TSC_COUNT_UPPER); clock_counter_lo = (uint64_t )RREG32_SOC15 (SMUIO ,0 , regGOLDEN_TSC_COUNT_LOWER); clock_counter_hi_after = (uint64_t )RREG32_SOC15 (SMUIO ,0 , regGOLDEN_TSC_COUNT_UPPER);if (clock_counter_hi_pre != clock_counter_hi_after) clock_counter_lo = (uint64_t )RREG32_SOC15 (SMUIO ,0 , regGOLDEN_TSC_COUNT_LOWER); +preempt_enable (); } clock = clock_counter_lo | (clock_counter_hi_after <<32ULL ); -mutex_unlock (&adev->gfx.gpu_clock_mutex); -amdgpu_gfx_off_ctrl (adev, true); +return clock; } --2.39.2
[AMD Official Use Only - General]
Regards,
Hawking
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Wednesday, April 12, 2023 05:14
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH V2] drm/amdgpu/gfx11: update gpu_clock_counter logic
This code was written prior to previous updates to this logic for other chips. The RSC registers are part of SMUIO which is an always on block so there is no need to disable gfxoff. Additionally add the carryover and preemption checks.
v2: rebase
--- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +7 -4
@@ -4673,24 +4673,27 @@ static uint64_t gfx_v11_0_get_gpu_clock_counter(struct amdgpu_device *adev)uint64_t clock;uint64_t clock_counter_lo, clock_counter_hi_pre, clock_counter_hi_after; -amdgpu_gfx_off_ctrl (adev, false); -mutex_lock (&adev->gfx.gpu_clock_mutex);if (amdgpu_sriov_vf (adev)) { +amdgpu_gfx_off_ctrl (adev, false); +mutex_lock (&adev->gfx.gpu_clock_mutex); clock_counter_hi_pre = (uint64_t )RREG32_SOC15 (GC ,0 , regCP_MES_MTIME_HI); clock_counter_lo = (uint64_t )RREG32_SOC15 (GC ,0 , regCP_MES_MTIME_LO); clock_counter_hi_after = (uint64_t )RREG32_SOC15 (GC ,0 , regCP_MES_MTIME_HI);if (clock_counter_hi_pre != clock_counter_hi_after) clock_counter_lo = (uint64_t )RREG32_SOC15 (GC ,0 , regCP_MES_MTIME_LO); +mutex_unlock (&adev->gfx.gpu_clock_mutex); +amdgpu_gfx_off_ctrl (adev, true); }else { +preempt_disable (); clock_counter_hi_pre = (uint64_t )RREG32_SOC15 (SMUIO ,0 , regGOLDEN_TSC_COUNT_UPPER); clock_counter_lo = (uint64_t )RREG32_SOC15 (SMUIO ,0 , regGOLDEN_TSC_COUNT_LOWER); clock_counter_hi_after = (uint64_t )RREG32_SOC15 (SMUIO ,0 , regGOLDEN_TSC_COUNT_UPPER);if (clock_counter_hi_pre != clock_counter_hi_after) clock_counter_lo = (uint64_t )RREG32_SOC15 (SMUIO ,0 , regGOLDEN_TSC_COUNT_LOWER); +preempt_enable (); } clock = clock_counter_lo | (clock_counter_hi_after <<32ULL ); -mutex_unlock (&adev->gfx.gpu_clock_mutex); -amdgpu_gfx_off_ctrl (adev, true); +return clock; }
--
2.39.2