drm/ttm: remove fault callback

Another one bites the dust.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/392325/

diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
index 991ef132e108da2ce675ed5588c96a8c04c2c463..87ee8f0ca08ed270dea6219eacad6523789dcdc3 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@ -290,28 +290,6 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf,
        vm_fault_t ret = VM_FAULT_NOPAGE;
        unsigned long address = vmf->address;
 
-       if (bdev->driver->fault_reserve_notify) {
-               struct dma_fence *moving = dma_fence_get(bo->moving);
-
-               err = bdev->driver->fault_reserve_notify(bo);
-               switch (err) {
-               case 0:
-                       break;
-               case -EBUSY:
-               case -ERESTARTSYS:
-                       dma_fence_put(moving);
-                       return VM_FAULT_NOPAGE;
-               default:
-                       dma_fence_put(moving);
-                       return VM_FAULT_SIGBUS;
-               }
-
-               if (bo->moving != moving) {
-                       ttm_bo_move_to_lru_tail_unlocked(bo);
-               }
-               dma_fence_put(moving);
-       }
-
        /*
         * Wait for buffer data in transit, due to a pipelined
         * move.

diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index 864afa8f6f18f4eb80057757e49866c4e8150aba..9897a16c0a9da059791a9192e265bafc38ca52f4 100644 (file)
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -190,9 +190,6 @@ struct ttm_bo_driver {
        void (*move_notify)(struct ttm_buffer_object *bo,
                            bool evict,
                            struct ttm_resource *new_mem);
-       /* notify the driver we are taking a fault on this BO
-        * and have reserved it */
-       int (*fault_reserve_notify)(struct ttm_buffer_object *bo);
 
        /**
         * notify the driver that we're about to swap out this bo