drm/ttm: drop the tt backend function paths.

These are now driver side.

Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200907204630.1406528-14-airlied@gmail.com

diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index 73c97dc..67aa7fe 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -222,10 +222,7 @@ void ttm_tt_destroy(struct ttm_bo_device *bdev, struct ttm_tt *ttm)
                fput(ttm->swap_storage);
 
        ttm->swap_storage = NULL;
-       if (bdev->driver->ttm_tt_destroy)
-               bdev->driver->ttm_tt_destroy(bdev, ttm);
-       else
-               ttm->func->destroy(bdev, ttm);
+       bdev->driver->ttm_tt_destroy(bdev, ttm);
 }
 
 static void ttm_tt_init_fields(struct ttm_tt *ttm,
@@ -313,10 +310,7 @@ EXPORT_SYMBOL(ttm_dma_tt_fini);
 void ttm_tt_unbind(struct ttm_bo_device *bdev, struct ttm_tt *ttm)
 {
        if (ttm->state == tt_bound) {
-               if (bdev->driver->ttm_tt_unbind)
-                       bdev->driver->ttm_tt_unbind(bdev, ttm);
-               else
-                       ttm->func->unbind(bdev, ttm);
+               bdev->driver->ttm_tt_unbind(bdev, ttm);
                ttm->state = tt_unbound;
        }
 }
@@ -337,10 +331,7 @@ int ttm_tt_bind(struct ttm_bo_device *bdev,
        if (ret)
                return ret;
 
-       if (bdev->driver->ttm_tt_bind)
-               ret = bdev->driver->ttm_tt_bind(bdev, ttm, bo_mem);
-       else
-               ret = ttm->func->bind(bdev, ttm, bo_mem);
+       ret = bdev->driver->ttm_tt_bind(bdev, ttm, bo_mem);
        if (unlikely(ret != 0))
                return ret;
 

diff --git a/include/drm/ttm/ttm_tt.h b/include/drm/ttm/ttm_tt.h
index bdc8aad..146544b 100644 (file)
--- a/include/drm/ttm/ttm_tt.h
+++ b/include/drm/ttm/ttm_tt.h
@@ -48,47 +48,9 @@ enum ttm_caching_state {
        tt_cached
 };
 
-struct ttm_backend_func {
-       /**
-        * struct ttm_backend_func member bind
-        *
-        * @ttm: Pointer to a struct ttm_tt.
-        * @bo_mem: Pointer to a struct ttm_resource describing the
-        * memory type and location for binding.
-        *
-        * Bind the backend pages into the aperture in the location
-        * indicated by @bo_mem. This function should be able to handle
-        * differences between aperture and system page sizes.
-        */
-       int (*bind) (struct ttm_bo_device *bdev, struct ttm_tt *ttm, struct ttm_resource *bo_mem);
-
-       /**
-        * struct ttm_backend_func member unbind
-        *
-        * @ttm: Pointer to a struct ttm_tt.
-        *
-        * Unbind previously bound backend pages. This function should be
-        * able to handle differences between aperture and system page sizes.
-        */
-       void (*unbind) (struct ttm_bo_device *bdev, struct ttm_tt *ttm);
-
-       /**
-        * struct ttm_backend_func member destroy
-        *
-        * @ttm: Pointer to a struct ttm_tt.
-        *
-        * Destroy the backend. This will be call back from ttm_tt_destroy so
-        * don't call ttm_tt_destroy from the callback or infinite loop.
-        */
-       void (*destroy) (struct ttm_bo_device *bdev, struct ttm_tt *ttm);
-};
-
 /**
  * struct ttm_tt
  *
- * @func: Pointer to a struct ttm_backend_func that describes
- * the backend methods.
- * pointer.
  * @pages: Array of pages backing the data.
  * @num_pages: Number of pages in the page array.
  * @bdev: Pointer to the current struct ttm_bo_device.
@@ -102,7 +64,6 @@ struct ttm_backend_func {
  * memory.
  */
 struct ttm_tt {
-       struct ttm_backend_func *func;
        struct page **pages;
        uint32_t page_flags;
        unsigned long num_pages;