drm/ttm: add ttm_tt_populate wrapper

Stop calling the driver callback directly.

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

diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index 33ffe286f3a517f4d8fc50ad0093f81c304bc658..38da6903cae9e6c53bb889ae6ce2a649c20005cf 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -375,8 +375,8 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
        /*
         * TTM might be null for moves within the same region.
         */
-       if (ttm && ttm->state == tt_unpopulated) {
-               ret = ttm->bdev->driver->ttm_tt_populate(ttm, ctx);
+       if (ttm) {
+               ret = ttm_tt_populate(ttm, ctx);
                if (ret)
                        goto out1;
        }
@@ -557,11 +557,9 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo,
 
        BUG_ON(!ttm);
 
-       if (ttm->state == tt_unpopulated) {
-               ret = ttm->bdev->driver->ttm_tt_populate(ttm, &ctx);
-               if (ret)
-                       return ret;
-       }
+       ret = ttm_tt_populate(ttm, &ctx);
+       if (ret)
+               return ret;
 
        if (num_pages == 1 && (mem->placement & TTM_PL_FLAG_CACHED)) {
                /*

diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
index 716e724ac7100ee71201d5300687291688236708..610d6714042a85ac3fecba65f9c0c7e7fc55586d 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@ -234,7 +234,7 @@ static int ttm_bo_vm_fault(struct vm_fault *vmf)
                                                cvma.vm_page_prot);
 
                /* Allocate all page at once, most common usage */
-               if (ttm->bdev->driver->ttm_tt_populate(ttm, &ctx)) {
+               if (ttm_tt_populate(ttm, &ctx)) {
                        ret = VM_FAULT_OOM;
                        goto out_io_unlock;
                }

diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index 95a77dab8cc950c0ce2ab90253a273f7bc5d02d9..39c44e301c721af19b3cd40e68459d9324cac23c 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -276,7 +276,7 @@ int ttm_tt_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem,
        if (ttm->state == tt_bound)
                return 0;
 
-       ret = ttm->bdev->driver->ttm_tt_populate(ttm, ctx);
+       ret = ttm_tt_populate(ttm, ctx);
        if (ret)
                return ret;
 
@@ -392,6 +392,14 @@ out_err:
        return ret;
 }
 
+int ttm_tt_populate(struct ttm_tt *ttm, struct ttm_operation_ctx *ctx)
+{
+       if (ttm->state != tt_unpopulated)
+               return 0;
+
+       return ttm->bdev->driver->ttm_tt_populate(ttm, ctx);
+}
+
 static void ttm_tt_clear_mapping(struct ttm_tt *ttm)
 {
        pgoff_t i;

diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index 9b417eb2df2083fb0f60dc6f01f1fa90474c27ad..2bac25a6cf9017f33818f89f1a001952dbb32e37 100644 (file)
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -700,6 +700,15 @@ int ttm_tt_swapin(struct ttm_tt *ttm);
 int ttm_tt_set_placement_caching(struct ttm_tt *ttm, uint32_t placement);
 int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage);
 
+/**
+ * ttm_tt_populate - allocate pages for a ttm
+ *
+ * @ttm: Pointer to the ttm_tt structure
+ *
+ * Calls the driver method to allocate pages for a ttm
+ */
+int ttm_tt_populate(struct ttm_tt *ttm, struct ttm_operation_ctx *ctx);
+
 /**
  * ttm_tt_unpopulate - free pages from a ttm
  *