drm/amdgpu: use cik_sdma_is_idle() in CIK SDMA

cik_sdma_is_idle() does exactly what we need, so use it.

V2: fix parameter (Alex)

Signed-off-by: Alexandre Demers <alexandre.f.demers@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
index 508cea9659832343a890ede8cf71ec3779517085..81a1f7fb6d78c4884465a61cb4d8d1d7a811eb1f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
@@ -1040,14 +1040,10 @@ static bool cik_sdma_is_idle(struct amdgpu_ip_block *ip_block)
 static int cik_sdma_wait_for_idle(struct amdgpu_ip_block *ip_block)
 {
        unsigned i;
-       u32 tmp;
        struct amdgpu_device *adev = ip_block->adev;
 
        for (i = 0; i < adev->usec_timeout; i++) {
-               tmp = RREG32(mmSRBM_STATUS2) & (SRBM_STATUS2__SDMA_BUSY_MASK |
-                               SRBM_STATUS2__SDMA1_BUSY_MASK);
-
-               if (!tmp)
+               if (cik_sdma_is_idle(ip_block))
                        return 0;
                udelay(1);
        }