drm/amdgpu/gfx8: reserve mqd objects before mapping them

It's required.

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

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index 286216b543170afef58f82d8ff68c835e1ad895c..bad28d8a42fb5892ba801d4bd3c2b75654f3c98e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -4963,31 +4963,40 @@ static int gfx_v8_0_kiq_resume(struct amdgpu_device *adev)
        gfx_v8_0_cp_compute_enable(adev, true);
 
        ring = &adev->gfx.kiq.ring;
-       if (!amdgpu_bo_kmap(ring->mqd_obj, &ring->mqd_ptr)) {
+
+       r = amdgpu_bo_reserve(ring->mqd_obj, false);
+       if (unlikely(r != 0))
+               goto done;
+
+       r = amdgpu_bo_kmap(ring->mqd_obj, &ring->mqd_ptr);
+       if (!r) {
                r = gfx_v8_0_kiq_init_queue(ring,
                                            (struct vi_mqd *)ring->mqd_ptr,
                                            ring->mqd_gpu_addr);
                amdgpu_bo_kunmap(ring->mqd_obj);
                ring->mqd_ptr = NULL;
-               if (r)
-                       return r;
-       } else {
-               return r;
        }
+       amdgpu_bo_unreserve(ring->mqd_obj);
+       if (r)
+               goto done;
 
        for (i = 0; i < adev->gfx.num_compute_rings; i++) {
                ring = &adev->gfx.compute_ring[i];
-               if (!amdgpu_bo_kmap(ring->mqd_obj, &ring->mqd_ptr)) {
+
+               r = amdgpu_bo_reserve(ring->mqd_obj, false);
+               if (unlikely(r != 0))
+                       goto done;
+               r = amdgpu_bo_kmap(ring->mqd_obj, &ring->mqd_ptr);
+               if (!r) {
                        r = gfx_v8_0_kiq_init_queue(ring,
                                                    (struct vi_mqd *)ring->mqd_ptr,
                                                    ring->mqd_gpu_addr);
                        amdgpu_bo_kunmap(ring->mqd_obj);
                        ring->mqd_ptr = NULL;
-                       if (r)
-                       return r;
-               } else {
-                       return r;
                }
+               amdgpu_bo_unreserve(ring->mqd_obj);
+               if (r)
+                       goto done;
        }
 
        for (i = 0; i < adev->gfx.num_compute_rings; i++) {
@@ -5005,7 +5014,8 @@ static int gfx_v8_0_kiq_resume(struct amdgpu_device *adev)
        if (r)
                ring->ready = false;
 
-       return 0;
+done:
+       return r;
 }
 
 static int gfx_v8_0_cp_compute_resume(struct amdgpu_device *adev)