hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/ttm: revert "add optional LRU removal callback v2" 

Without the custom LRU management the callback is not used any more.

agd: fix trivial warning

Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-and-Tested-by: Roger.He <Hongbo.He@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2017-01-12 11:54:11 +01:00 committed by Alex Deucher
parent 260498f2cd
commit 896d630d24
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/ttm/ttm_bo.c
View File

@ -186,12 +186,8 @@ EXPORT_SYMBOL(ttm_bo_add_to_lru);
int ttm_bo_del_from_lru(struct ttm_buffer_object *bo) int ttm_bo_del_from_lru(struct ttm_buffer_object *bo)
{ {
struct ttm_bo_device *bdev = bo->bdev;
int put_count = 0; int put_count = 0;
if (bdev->driver->lru_removal)
bdev->driver->lru_removal(bo);
if (!list_empty(&bo->swap)) { if (!list_empty(&bo->swap)) {
list_del_init(&bo->swap); list_del_init(&bo->swap);
++put_count; ++put_count;
@ -201,6 +197,11 @@ int ttm_bo_del_from_lru(struct ttm_buffer_object *bo)
++put_count; ++put_count;
} }
/*
* TODO: Add a driver hook to delete from
* driver-specific LRU's here.
*/
return put_count; return put_count;
} }
@ -229,14 +230,10 @@ EXPORT_SYMBOL(ttm_bo_del_sub_from_lru);
void ttm_bo_move_to_lru_tail(struct ttm_buffer_object *bo) void ttm_bo_move_to_lru_tail(struct ttm_buffer_object *bo)
{ {
struct ttm_bo_device *bdev = bo->bdev;
int put_count = 0; int put_count = 0;
lockdep_assert_held(&bo->resv->lock.base); lockdep_assert_held(&bo->resv->lock.base);
if (bdev->driver->lru_removal)
bdev->driver->lru_removal(bo);
put_count = ttm_bo_del_from_lru(bo); put_count = ttm_bo_del_from_lru(bo);
ttm_bo_list_ref_sub(bo, put_count, true); ttm_bo_list_ref_sub(bo, put_count, true);
ttm_bo_add_to_lru(bo); ttm_bo_add_to_lru(bo);

6
include/drm/ttm/ttm_bo_driver.h
View File

@ -462,12 +462,6 @@ struct ttm_bo_driver {
struct ttm_mem_reg *mem); struct ttm_mem_reg *mem);
void (*io_mem_free)(struct ttm_bo_device *bdev, void (*io_mem_free)(struct ttm_bo_device *bdev,
struct ttm_mem_reg *mem); struct ttm_mem_reg *mem);
/**
* Optional driver callback for when BO is removed from the LRU.
* Called with LRU lock held immediately before the removal.
*/
void (*lru_removal)(struct ttm_buffer_object *bo);
}; };
/** /**