drm/amdgpu: free the BO in kernel by helper amdgpu_bo_free_kernel()

Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 4 insertions, 15 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
index 242ba04bfde6..777f11b63b4c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
@@ -252,28 +252,17 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
  */
 void amdgpu_ring_fini(struct amdgpu_ring *ring)
 {
-        int r;
-        struct amdgpu_bo *ring_obj;
-
-        ring_obj = ring->ring_obj;
         ring->ready = false;
-        ring->ring = NULL;
-        ring->ring_obj = NULL;
 
         amdgpu_wb_free(ring->adev, ring->cond_exe_offs);
         amdgpu_wb_free(ring->adev, ring->fence_offs);
         amdgpu_wb_free(ring->adev, ring->rptr_offs);
         amdgpu_wb_free(ring->adev, ring->wptr_offs);
 
-        if (ring_obj) {
-                r = amdgpu_bo_reserve(ring_obj, false);
-                if (likely(r == 0)) {
-                        amdgpu_bo_kunmap(ring_obj);
-                        amdgpu_bo_unpin(ring_obj);
-                        amdgpu_bo_unreserve(ring_obj);
-                }
-                amdgpu_bo_unref(&ring_obj);
-        }
+        amdgpu_bo_free_kernel(&ring->ring_obj,
+                              &ring->gpu_addr,
+                              (void **)&ring->ring);
+
         amdgpu_debugfs_ring_fini(ring);
 }