Applied 1-4 with some minor fixes.
Alex
On Sat, Mar 22, 2025 at 3:03 PM Alexandre Demers
<alexandre.f.dem...@gmail.com> wrote:
>
> gmc_v7_0_is_idle() does exactly what we need, so use it.
>
> Signed-off-by: Alexandre Demers <alexandre.f.dem...@gmail.com>
> ---
> drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 9 +--------
> 1 file changed, 1 insertion(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> index b6016f11956e..1a8df3caedb1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> @@ -1156,17 +1156,10 @@ static bool gmc_v7_0_is_idle(void *handle)
> static int gmc_v7_0_wait_for_idle(struct amdgpu_ip_block *ip_block)
> {
> unsigned int i;
> - u32 tmp;
> struct amdgpu_device *adev = ip_block->adev;
>
> for (i = 0; i < adev->usec_timeout; i++) {
> - /* read MC_STATUS */
> - tmp = RREG32(mmSRBM_STATUS) & (SRBM_STATUS__MCB_BUSY_MASK |
> -
> SRBM_STATUS__MCB_NON_DISPLAY_BUSY_MASK |
> - SRBM_STATUS__MCC_BUSY_MASK |
> - SRBM_STATUS__MCD_BUSY_MASK |
> - SRBM_STATUS__VMC_BUSY_MASK);
> - if (!tmp)
> + if (gmc_v7_0_is_idle(adev))
> return 0;
> udelay(1);
> }
> --
> 2.49.0
>
