1 files changed, 16 insertions, 15 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
index 15df46c93f0a..2b4242b39b0a 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
@@ -614,6 +614,7 @@ static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring)
 {
         struct amdgpu_device *adev = ring->adev;
         struct amdgpu_ib ib;
+        struct fence *f = NULL;
         unsigned i;
         unsigned index;
         int r;
@@ -629,12 +630,10 @@ static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring)
         gpu_addr = adev->wb.gpu_addr + (index * 4);
         tmp = 0xCAFEDEAD;
         adev->wb.wb[index] = cpu_to_le32(tmp);
-
         r = amdgpu_ib_get(ring, NULL, 256, &ib);
         if (r) {
-                amdgpu_wb_free(adev, index);
                 DRM_ERROR("amdgpu: failed to get ib (%d).\n", r);
-                return r;
+                goto err0;
         }
 
         ib.ptr[0] = SDMA_PACKET(SDMA_OPCODE_WRITE, SDMA_WRITE_SUB_OPCODE_LINEAR, 0);
@@ -643,20 +642,16 @@ static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring)
         ib.ptr[3] = 1;
         ib.ptr[4] = 0xDEADBEEF;
         ib.length_dw = 5;
+        r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, &ib, 1, NULL,
+                                                 AMDGPU_FENCE_OWNER_UNDEFINED,
+                                                 &f);
+        if (r)
+                goto err1;
 
-        r = amdgpu_ib_schedule(adev, 1, &ib, AMDGPU_FENCE_OWNER_UNDEFINED);
+        r = fence_wait(f, false);
         if (r) {
-                amdgpu_ib_free(adev, &ib);
-                amdgpu_wb_free(adev, index);
-                DRM_ERROR("amdgpu: failed to schedule ib (%d).\n", r);
-                return r;
-        }
-        r = amdgpu_fence_wait(ib.fence, false);
-        if (r) {
-                amdgpu_ib_free(adev, &ib);
-                amdgpu_wb_free(adev, index);
                 DRM_ERROR("amdgpu: fence wait failed (%d).\n", r);
-                return r;
+                goto err1;
         }
         for (i = 0; i < adev->usec_timeout; i++) {
                 tmp = le32_to_cpu(adev->wb.wb[index]);
@@ -666,12 +661,17 @@ static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring)
         }
         if (i < adev->usec_timeout) {
                 DRM_INFO("ib test on ring %d succeeded in %u usecs\n",
-                         ib.fence->ring->idx, i);
+                         ring->idx, i);
+                goto err1;
         } else {
                 DRM_ERROR("amdgpu: ib test failed (0x%08X)\n", tmp);
                 r = -EINVAL;
         }
+
+err1:
+        fence_put(f);
         amdgpu_ib_free(adev, &ib);
+err0:
         amdgpu_wb_free(adev, index);
         return r;
 }
@@ -1404,5 +1404,6 @@ static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev)
         if (adev->vm_manager.vm_pte_funcs == NULL) {
                 adev->vm_manager.vm_pte_funcs = &cik_sdma_vm_pte_funcs;
                 adev->vm_manager.vm_pte_funcs_ring = &adev->sdma[0].ring;
+                adev->vm_manager.vm_pte_funcs_ring->is_pte_ring = true;
         }
 }