diff options
| author | Christian König <christian.koenig@amd.com> | 2020-09-25 15:45:19 +0200 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2020-09-28 12:37:50 +0200 |
| commit | 45e241f8c5d7798e63a0c79b49d39fc9d38e8f59 (patch) | |
| tree | acafd3659426b4bc2be126665a552bdf00e89466 | |
| parent | 76fe313adde2db165aea82699aca215ea6e9b11b (diff) | |
| download | linux-45e241f8c5d7798e63a0c79b49d39fc9d38e8f59.tar.bz2 | |
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/
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo_vm.c | 22 | ||||
| -rw-r--r-- | include/drm/ttm/ttm_bo_driver.h | 3 |
2 files changed, 0 insertions, 25 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index 991ef132e108..87ee8f0ca08e 100644 --- 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 864afa8f6f18..9897a16c0a9d 100644 --- 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 |