openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/ttm: split bound/populated flags. 

Move bound up into the bo object, and keep populated with the tt
object.

The ghost object handling needs to follow the flags at the bo
level now instead of it being part of the ttm tt object.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200915024007.67163-7-airlied@gmail.com
This commit is contained in:
Dave Airlie 2020-09-15 11:42:30 +10:00
parent 9e9a153bdf
commit 3a4ab168a5
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpu/drm/ttm/ttm_bo_util.c
View File

@ -572,10 +572,13 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
* bo to be unbound and destroyed.
*/
if (man->use_tt)
if (man->use_tt) {
ghost_obj->ttm = NULL;
else
ttm_bo_tt_set_unbound(ghost_obj);
} else {
bo->ttm = NULL;
ttm_bo_tt_set_unbound(bo);
}
dma_resv_unlock(&ghost_obj->base._resv);
ttm_bo_put(ghost_obj);
@ -628,10 +631,13 @@ int ttm_bo_pipeline_move(struct ttm_buffer_object *bo,
* bo to be unbound and destroyed.
*/
if (to->use_tt)
if (to->use_tt) {
ghost_obj->ttm = NULL;
else
ttm_bo_tt_set_unbound(ghost_obj);
} else {
bo->ttm = NULL;
ttm_bo_tt_set_unbound(bo);
}
dma_resv_unlock(&ghost_obj->base._resv);
ttm_bo_put(ghost_obj);
@ -695,6 +701,7 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo)
memset(&bo->mem, 0, sizeof(bo->mem));
bo->mem.mem_type = TTM_PL_SYSTEM;
bo->ttm = NULL;
ttm_bo_tt_set_unbound(bo);
dma_resv_unlock(&ghost->base._resv);
ttm_bo_put(ghost);

1
include/drm/ttm/ttm_bo_api.h
View File

@ -141,6 +141,7 @@ struct ttm_buffer_object {
struct ttm_resource mem;
struct file *persistent_swap_storage;
struct ttm_tt *ttm;
bool ttm_bound;
bool evicted;
bool deleted;

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

@ -700,17 +700,17 @@ void ttm_bo_tt_unbind(struct ttm_buffer_object *bo);
static inline bool ttm_bo_tt_is_bound(struct ttm_buffer_object *bo)
{
return bo->ttm->_state == tt_bound;
return bo->ttm_bound;
}
static inline void ttm_bo_tt_set_unbound(struct ttm_buffer_object *bo)
{
bo->ttm->_state = tt_unbound;
bo->ttm_bound = false;
}
static inline void ttm_bo_tt_set_bound(struct ttm_buffer_object *bo)
{
bo->ttm->_state = tt_bound;
bo->ttm_bound = true;
}
/**
* ttm_bo_tt_destroy.

12
include/drm/ttm/ttm_tt.h
View File

@ -70,26 +70,22 @@ struct ttm_tt {
struct sg_table *sg; /* for SG objects via dma-buf */
struct file *swap_storage;
enum ttm_caching_state caching_state;
enum {
tt_bound,
tt_unbound,
tt_unpopulated,
} _state;
bool populated;
};
static inline bool ttm_tt_is_populated(struct ttm_tt *tt)
{
return tt->_state != tt_unpopulated;
return tt->populated;
}
static inline void ttm_tt_set_unpopulated(struct ttm_tt *tt)
{
tt->_state = tt_unpopulated;
tt->populated = false;
}
static inline void ttm_tt_set_populated(struct ttm_tt *tt)
{
tt->_state = tt_unbound;
tt->populated = true;
}
/**