Commit 5e791166 authored by Christian König's avatar Christian König Committed by Christian König
Browse files

drm/ttm: nuke invalidate_caches callback 



Another completely unused feature.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Link: https://patchwork.freedesktop.org/patch/348265/
parent e4eed858

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+0 −6
Original line number Diff line number Diff line
@@ -68,11 +68,6 @@ static int amdgpu_map_buffer(struct ttm_buffer_object *bo, 
static int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev);

static void amdgpu_ttm_debugfs_fini(struct amdgpu_device *adev);



static int amdgpu_invalidate_caches(struct ttm_bo_device *bdev, uint32_t flags)

{

	return 0;

}



/**

 * amdgpu_init_mem_type - Initialize a memory manager for a specific type of

 * memory request.
@@ -1637,7 +1632,6 @@ static struct ttm_bo_driver amdgpu_bo_driver = { 
	.ttm_tt_create = &amdgpu_ttm_tt_create,

	.ttm_tt_populate = &amdgpu_ttm_tt_populate,

	.ttm_tt_unpopulate = &amdgpu_ttm_tt_unpopulate,

	.invalidate_caches = &amdgpu_invalidate_caches,

	.init_mem_type = &amdgpu_init_mem_type,

	.eviction_valuable = amdgpu_ttm_bo_eviction_valuable,

	.evict_flags = &amdgpu_evict_flags,

drivers/gpu/drm/nouveau/nouveau_bo.c

+0 −8
Original line number Diff line number Diff line
@@ -646,13 +646,6 @@ nouveau_ttm_tt_create(struct ttm_buffer_object *bo, uint32_t page_flags) 
	return nouveau_sgdma_create_ttm(bo, page_flags);

}



static int

nouveau_bo_invalidate_caches(struct ttm_bo_device *bdev, uint32_t flags)

{

	/* We'll do this from user space. */

	return 0;

}



static int

nouveau_bo_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,

			 struct ttm_mem_type_manager *man)
@@ -1696,7 +1689,6 @@ struct ttm_bo_driver nouveau_bo_driver = { 
	.ttm_tt_create = &nouveau_ttm_tt_create,

	.ttm_tt_populate = &nouveau_ttm_tt_populate,

	.ttm_tt_unpopulate = &nouveau_ttm_tt_unpopulate,

	.invalidate_caches = nouveau_bo_invalidate_caches,

	.init_mem_type = nouveau_bo_init_mem_type,

	.eviction_valuable = ttm_bo_eviction_valuable,

	.evict_flags = nouveau_bo_evict_flags,

drivers/gpu/drm/qxl/qxl_ttm.c

+0 −6
Original line number Diff line number Diff line
@@ -48,11 +48,6 @@ static struct qxl_device *qxl_get_qdev(struct ttm_bo_device *bdev) 
	return qdev;

}



static int qxl_invalidate_caches(struct ttm_bo_device *bdev, uint32_t flags)

{

	return 0;

}



static int qxl_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,

			     struct ttm_mem_type_manager *man)

{
@@ -256,7 +251,6 @@ static void qxl_bo_move_notify(struct ttm_buffer_object *bo, 


static struct ttm_bo_driver qxl_bo_driver = {

	.ttm_tt_create = &qxl_ttm_tt_create,

	.invalidate_caches = &qxl_invalidate_caches,

	.init_mem_type = &qxl_init_mem_type,

	.eviction_valuable = ttm_bo_eviction_valuable,

	.evict_flags = &qxl_evict_flags,

drivers/gpu/drm/radeon/radeon_ttm.c

+0 −6
Original line number Diff line number Diff line
@@ -66,11 +66,6 @@ static struct radeon_device *radeon_get_rdev(struct ttm_bo_device *bdev) 
	return rdev;

}



static int radeon_invalidate_caches(struct ttm_bo_device *bdev, uint32_t flags)

{

	return 0;

}



static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,

				struct ttm_mem_type_manager *man)

{
@@ -774,7 +769,6 @@ static struct ttm_bo_driver radeon_bo_driver = { 
	.ttm_tt_create = &radeon_ttm_tt_create,

	.ttm_tt_populate = &radeon_ttm_tt_populate,

	.ttm_tt_unpopulate = &radeon_ttm_tt_unpopulate,

	.invalidate_caches = &radeon_invalidate_caches,

	.init_mem_type = &radeon_init_mem_type,

	.eviction_valuable = ttm_bo_eviction_valuable,

	.evict_flags = &radeon_evict_flags,

drivers/gpu/drm/ttm/ttm_bo.c

+1 −8
Original line number Diff line number Diff line
@@ -372,14 +372,7 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, 
	}



moved:

	if (bo->evicted) {

		if (bdev->driver->invalidate_caches) {

			ret = bdev->driver->invalidate_caches(bdev, bo->mem.placement);

			if (ret)

				pr_err("Can not flush read caches\n");

		}

	bo->evicted = false;

	}



	if (bo->mem.mm_node)

		bo->offset = (bo->mem.start << PAGE_SHIFT) +

CRA Git | Maintained and supported by SUSTech CRA and CCSE