drm/amdgpu: export reservation_object from dmabuf to ttm (v2)

Adds an extra argument to amdgpu_bo_create, which is only used in amdgpu_prime.c.

Port of radeon commit 831b6966a60fe72d85ae3576056b4e4e0775b112.

v2: fix up kfd.

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

1 files changed, 8 insertions, 7 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 08b09d55b96f..f25cfed33927 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -215,6 +215,7 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev,
                                 bool kernel, u32 domain, u64 flags,
                                 struct sg_table *sg,
                                 struct ttm_placement *placement,
+                                struct reservation_object *resv,
                                 struct amdgpu_bo **bo_ptr)
 {
         struct amdgpu_bo *bo;
@@ -261,7 +262,7 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev,
         /* Kernel allocation are uninterruptible */
         r = ttm_bo_init(&adev->mman.bdev, &bo->tbo, size, type,
                         &bo->placement, page_align, !kernel, NULL,
-                        acc_size, sg, NULL, &amdgpu_ttm_bo_destroy);
+                        acc_size, sg, resv, &amdgpu_ttm_bo_destroy);
         if (unlikely(r != 0)) {
                 return r;
         }
@@ -275,7 +276,9 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev,
 int amdgpu_bo_create(struct amdgpu_device *adev,
                      unsigned long size, int byte_align,
                      bool kernel, u32 domain, u64 flags,
-                     struct sg_table *sg, struct amdgpu_bo **bo_ptr)
+                     struct sg_table *sg,
+                     struct reservation_object *resv,
+                     struct amdgpu_bo **bo_ptr)
 {
         struct ttm_placement placement = {0};
         struct ttm_place placements[AMDGPU_GEM_DOMAIN_MAX + 1];
@@ -286,11 +289,9 @@ int amdgpu_bo_create(struct amdgpu_device *adev,
         amdgpu_ttm_placement_init(adev, &placement,
                                   placements, domain, flags);
 
-        return amdgpu_bo_create_restricted(adev, size, byte_align,
-                                           kernel, domain, flags,
-                                           sg,
-                                           &placement,
-                                           bo_ptr);
+        return amdgpu_bo_create_restricted(adev, size, byte_align, kernel,
+                                           domain, flags, sg, &placement,
+                                           resv, bo_ptr);
 }
 
 int amdgpu_bo_kmap(struct amdgpu_bo *bo, void **ptr)