Commit f227ccc9 authored by Dave Airlie's avatar Dave Airlie

drm/ttm: drop unbind callback.

The drivers now control this, so drop unbinding.
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201020010319.1692445-5-airlied@gmail.com
parent 29a1d482
...@@ -1722,7 +1722,6 @@ static struct ttm_bo_driver amdgpu_bo_driver = { ...@@ -1722,7 +1722,6 @@ static struct ttm_bo_driver amdgpu_bo_driver = {
.ttm_tt_populate = &amdgpu_ttm_tt_populate, .ttm_tt_populate = &amdgpu_ttm_tt_populate,
.ttm_tt_unpopulate = &amdgpu_ttm_tt_unpopulate, .ttm_tt_unpopulate = &amdgpu_ttm_tt_unpopulate,
.ttm_tt_bind = &amdgpu_ttm_backend_bind, .ttm_tt_bind = &amdgpu_ttm_backend_bind,
.ttm_tt_unbind = &amdgpu_ttm_backend_unbind,
.ttm_tt_destroy = &amdgpu_ttm_backend_destroy, .ttm_tt_destroy = &amdgpu_ttm_backend_destroy,
.eviction_valuable = amdgpu_ttm_bo_eviction_valuable, .eviction_valuable = amdgpu_ttm_bo_eviction_valuable,
.evict_flags = &amdgpu_evict_flags, .evict_flags = &amdgpu_evict_flags,
......
...@@ -1394,7 +1394,6 @@ struct ttm_bo_driver nouveau_bo_driver = { ...@@ -1394,7 +1394,6 @@ struct ttm_bo_driver nouveau_bo_driver = {
.ttm_tt_populate = &nouveau_ttm_tt_populate, .ttm_tt_populate = &nouveau_ttm_tt_populate,
.ttm_tt_unpopulate = &nouveau_ttm_tt_unpopulate, .ttm_tt_unpopulate = &nouveau_ttm_tt_unpopulate,
.ttm_tt_bind = &nouveau_ttm_tt_bind, .ttm_tt_bind = &nouveau_ttm_tt_bind,
.ttm_tt_unbind = &nouveau_ttm_tt_unbind,
.ttm_tt_destroy = &nouveau_ttm_tt_destroy, .ttm_tt_destroy = &nouveau_ttm_tt_destroy,
.eviction_valuable = ttm_bo_eviction_valuable, .eviction_valuable = ttm_bo_eviction_valuable,
.evict_flags = nouveau_bo_evict_flags, .evict_flags = nouveau_bo_evict_flags,
......
...@@ -113,12 +113,6 @@ static int qxl_ttm_backend_bind(struct ttm_bo_device *bdev, ...@@ -113,12 +113,6 @@ static int qxl_ttm_backend_bind(struct ttm_bo_device *bdev,
return -1; return -1;
} }
static void qxl_ttm_backend_unbind(struct ttm_bo_device *bdev,
struct ttm_tt *ttm)
{
/* Not implemented */
}
static void qxl_ttm_backend_destroy(struct ttm_bo_device *bdev, static void qxl_ttm_backend_destroy(struct ttm_bo_device *bdev,
struct ttm_tt *ttm) struct ttm_tt *ttm)
{ {
...@@ -180,7 +174,6 @@ static struct ttm_bo_driver qxl_bo_driver = { ...@@ -180,7 +174,6 @@ static struct ttm_bo_driver qxl_bo_driver = {
.ttm_tt_create = &qxl_ttm_tt_create, .ttm_tt_create = &qxl_ttm_tt_create,
.ttm_tt_bind = &qxl_ttm_backend_bind, .ttm_tt_bind = &qxl_ttm_backend_bind,
.ttm_tt_destroy = &qxl_ttm_backend_destroy, .ttm_tt_destroy = &qxl_ttm_backend_destroy,
.ttm_tt_unbind = &qxl_ttm_backend_unbind,
.eviction_valuable = ttm_bo_eviction_valuable, .eviction_valuable = ttm_bo_eviction_valuable,
.evict_flags = &qxl_evict_flags, .evict_flags = &qxl_evict_flags,
.move = &qxl_bo_move, .move = &qxl_bo_move,
......
...@@ -817,7 +817,6 @@ static struct ttm_bo_driver radeon_bo_driver = { ...@@ -817,7 +817,6 @@ static struct ttm_bo_driver radeon_bo_driver = {
.ttm_tt_populate = &radeon_ttm_tt_populate, .ttm_tt_populate = &radeon_ttm_tt_populate,
.ttm_tt_unpopulate = &radeon_ttm_tt_unpopulate, .ttm_tt_unpopulate = &radeon_ttm_tt_unpopulate,
.ttm_tt_bind = &radeon_ttm_tt_bind, .ttm_tt_bind = &radeon_ttm_tt_bind,
.ttm_tt_unbind = &radeon_ttm_tt_unbind,
.ttm_tt_destroy = &radeon_ttm_tt_destroy, .ttm_tt_destroy = &radeon_ttm_tt_destroy,
.eviction_valuable = ttm_bo_eviction_valuable, .eviction_valuable = ttm_bo_eviction_valuable,
.evict_flags = &radeon_evict_flags, .evict_flags = &radeon_evict_flags,
......
...@@ -1496,8 +1496,3 @@ int ttm_bo_tt_bind(struct ttm_buffer_object *bo, struct ttm_resource *mem) ...@@ -1496,8 +1496,3 @@ int ttm_bo_tt_bind(struct ttm_buffer_object *bo, struct ttm_resource *mem)
{ {
return bo->bdev->driver->ttm_tt_bind(bo->bdev, bo->ttm, mem); return bo->bdev->driver->ttm_tt_bind(bo->bdev, bo->ttm, mem);
} }
void ttm_bo_tt_unbind(struct ttm_buffer_object *bo)
{
bo->bdev->driver->ttm_tt_unbind(bo->bdev, bo->ttm);
}
...@@ -760,7 +760,6 @@ struct ttm_bo_driver vmw_bo_driver = { ...@@ -760,7 +760,6 @@ struct ttm_bo_driver vmw_bo_driver = {
.ttm_tt_populate = &vmw_ttm_populate, .ttm_tt_populate = &vmw_ttm_populate,
.ttm_tt_unpopulate = &vmw_ttm_unpopulate, .ttm_tt_unpopulate = &vmw_ttm_unpopulate,
.ttm_tt_bind = &vmw_ttm_bind, .ttm_tt_bind = &vmw_ttm_bind,
.ttm_tt_unbind = &vmw_ttm_unbind,
.ttm_tt_destroy = &vmw_ttm_destroy, .ttm_tt_destroy = &vmw_ttm_destroy,
.eviction_valuable = ttm_bo_eviction_valuable, .eviction_valuable = ttm_bo_eviction_valuable,
.evict_flags = vmw_evict_flags, .evict_flags = vmw_evict_flags,
......
...@@ -104,17 +104,6 @@ struct ttm_bo_driver { ...@@ -104,17 +104,6 @@ struct ttm_bo_driver {
*/ */
int (*ttm_tt_bind)(struct ttm_bo_device *bdev, struct ttm_tt *ttm, struct ttm_resource *bo_mem); int (*ttm_tt_bind)(struct ttm_bo_device *bdev, struct ttm_tt *ttm, struct ttm_resource *bo_mem);
/**
* ttm_tt_unbind
*
* @bdev: Pointer to a ttm device
* @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 (*ttm_tt_unbind)(struct ttm_bo_device *bdev, struct ttm_tt *ttm);
/** /**
* ttm_tt_destroy * ttm_tt_destroy
* *
...@@ -647,13 +636,6 @@ pgprot_t ttm_io_prot(struct ttm_buffer_object *bo, struct ttm_resource *res, ...@@ -647,13 +636,6 @@ pgprot_t ttm_io_prot(struct ttm_buffer_object *bo, struct ttm_resource *res,
*/ */
int ttm_bo_tt_bind(struct ttm_buffer_object *bo, struct ttm_resource *mem); int ttm_bo_tt_bind(struct ttm_buffer_object *bo, struct ttm_resource *mem);
/**
* ttm_bo_tt_bind
*
* Unbind the object tt from a memory resource.
*/
void ttm_bo_tt_unbind(struct ttm_buffer_object *bo);
/** /**
* ttm_bo_tt_destroy. * ttm_bo_tt_destroy.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment