drm/ttm: add ttm_bo_init_reserved

This variant of ttm_bo_init returns the validated buffer object with
the reservation lock held when resv == NULL. This is convenient for
callers that want to use the BO immediately, e.g. for initializing its
contents.

Signed-off-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 44 insertions, 15 deletions

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 9a6dea976f02..412240a3ba90 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1093,18 +1093,18 @@ int ttm_bo_validate(struct ttm_buffer_object *bo,
 }
 EXPORT_SYMBOL(ttm_bo_validate);
 
-int ttm_bo_init(struct ttm_bo_device *bdev,
-                struct ttm_buffer_object *bo,
-                unsigned long size,
-                enum ttm_bo_type type,
-                struct ttm_placement *placement,
-                uint32_t page_alignment,
-                bool interruptible,
-                struct file *persistent_swap_storage,
-                size_t acc_size,
-                struct sg_table *sg,
-                struct reservation_object *resv,
-                void (*destroy) (struct ttm_buffer_object *))
+int ttm_bo_init_reserved(struct ttm_bo_device *bdev,
+                         struct ttm_buffer_object *bo,
+                         unsigned long size,
+                         enum ttm_bo_type type,
+                         struct ttm_placement *placement,
+                         uint32_t page_alignment,
+                         bool interruptible,
+                         struct file *persistent_swap_storage,
+                         size_t acc_size,
+                         struct sg_table *sg,
+                         struct reservation_object *resv,
+                         void (*destroy) (struct ttm_buffer_object *))
 {
         int ret = 0;
         unsigned long num_pages;
@@ -1188,10 +1188,10 @@ int ttm_bo_init(struct ttm_bo_device *bdev,
         if (likely(!ret))
                 ret = ttm_bo_validate(bo, placement, interruptible, false);
 
-        if (!resv)
-                ttm_bo_unreserve(bo);
-
         if (unlikely(ret)) {
+                if (!resv)
+                        ttm_bo_unreserve(bo);
+
                 ttm_bo_unref(&bo);
                 return ret;
         }
@@ -1204,6 +1204,35 @@ int ttm_bo_init(struct ttm_bo_device *bdev,
 
         return ret;
 }
+EXPORT_SYMBOL(ttm_bo_init_reserved);
+
+int ttm_bo_init(struct ttm_bo_device *bdev,
+                struct ttm_buffer_object *bo,
+                unsigned long size,
+                enum ttm_bo_type type,
+                struct ttm_placement *placement,
+                uint32_t page_alignment,
+                bool interruptible,
+                struct file *persistent_swap_storage,
+                size_t acc_size,
+                struct sg_table *sg,
+                struct reservation_object *resv,
+                void (*destroy) (struct ttm_buffer_object *))
+{
+        int ret;
+
+        ret = ttm_bo_init_reserved(bdev, bo, size, type, placement,
+                                   page_alignment, interruptible,
+                                   persistent_swap_storage, acc_size,
+                                   sg, resv, destroy);
+        if (ret)
+                return ret;
+
+        if (!resv)
+                ttm_bo_unreserve(bo);
+
+        return 0;
+}
 EXPORT_SYMBOL(ttm_bo_init);
 
 size_t ttm_bo_acc_size(struct ttm_bo_device *bdev,