Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 06:33:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/ttm: use a static ttm_bo_global instance

Browse Source 
As the name says we only need one global instance of ttm_bo_global.

Just use a single exported instance which is save to initialize multiple times.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2018-10-19 15:06:06 +02:00 committed by Alex Deucher
parent 56b3d20413
commit 62b53b37e4
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,9 @@ static void ttm_bo_global_kobj_release(struct kobject *kobj);
* ttm_global_mutex - protecting the global BO state * ttm_global_mutex - protecting the global BO state
*/ */
DEFINE_MUTEX(ttm_global_mutex); DEFINE_MUTEX(ttm_global_mutex);
struct ttm_bo_global ttm_bo_glob = {
.use_count = 0
};
static struct attribute ttm_bo_count = { static struct attribute ttm_bo_count = {
.name = "bo_count", .name = "bo_count",
@ -1527,22 +1530,35 @@ static void ttm_bo_global_kobj_release(struct kobject *kobj)
kfree(glob); kfree(glob);
} }
void ttm_bo_global_release(struct ttm_bo_global *glob) void ttm_bo_global_release(void)
{ {
struct ttm_bo_global *glob = &ttm_bo_glob;
mutex_lock(&ttm_global_mutex);
if (--glob->use_count > 0)
goto out;
kobject_del(&glob->kobj); kobject_del(&glob->kobj);
kobject_put(&glob->kobj); kobject_put(&glob->kobj);
ttm_mem_global_release(&ttm_mem_glob); ttm_mem_global_release(&ttm_mem_glob);
out:
mutex_unlock(&ttm_global_mutex);
} }
EXPORT_SYMBOL(ttm_bo_global_release); EXPORT_SYMBOL(ttm_bo_global_release);
int ttm_bo_global_init(struct ttm_bo_global *glob) int ttm_bo_global_init(void)
{ {
int ret; struct ttm_bo_global *glob = &ttm_bo_glob;
int ret = 0;
unsigned i; unsigned i;
mutex_lock(&ttm_global_mutex);
if (++glob->use_count > 1)
goto out;
ret = ttm_mem_global_init(&ttm_mem_glob); ret = ttm_mem_global_init(&ttm_mem_glob);
if (ret) if (ret)
return ret; goto out;
spin_lock_init(&glob->lru_lock); spin_lock_init(&glob->lru_lock);
glob->mem_glob = &ttm_mem_glob; glob->mem_glob = &ttm_mem_glob;
@ -1551,7 +1567,7 @@ int ttm_bo_global_init(struct ttm_bo_global *glob)
if (unlikely(glob->dummy_read_page == NULL)) { if (unlikely(glob->dummy_read_page == NULL)) {
ret = -ENOMEM; ret = -ENOMEM;
goto out_no_drp; goto out;
} }
for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i)
@ -1563,9 +1579,8 @@ int ttm_bo_global_init(struct ttm_bo_global *glob)
&glob->kobj, &ttm_bo_glob_kobj_type, ttm_get_kobj(), "buffer_objects"); &glob->kobj, &ttm_bo_glob_kobj_type, ttm_get_kobj(), "buffer_objects");
if (unlikely(ret != 0)) if (unlikely(ret != 0))
kobject_put(&glob->kobj); kobject_put(&glob->kobj);
return ret; out:
out_no_drp: mutex_unlock(&ttm_global_mutex);
kfree(glob);
return ret; return ret;
} }
EXPORT_SYMBOL(ttm_bo_global_init); EXPORT_SYMBOL(ttm_bo_global_init);

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

@ -398,7 +398,7 @@ struct ttm_bo_driver {
* @swap_lru: Lru list of buffer objects used for swapping. * @swap_lru: Lru list of buffer objects used for swapping.
*/ */
struct ttm_bo_global { extern struct ttm_bo_global {
/** /**
* Constant after init. * Constant after init.
@ -410,8 +410,9 @@ struct ttm_bo_global {
spinlock_t lru_lock; spinlock_t lru_lock;
/** /**
* Protected by device_list_mutex. * Protected by ttm_global_mutex.
*/ */
unsigned int use_count;
struct list_head device_list; struct list_head device_list;
/** /**
@ -423,7 +424,7 @@ struct ttm_bo_global {
* Internal protection. * Internal protection.
*/ */
atomic_t bo_count; atomic_t bo_count;
}; } ttm_bo_glob;
#define TTM_NUM_MEM_TYPES 8 #define TTM_NUM_MEM_TYPES 8
@ -568,8 +569,8 @@ void ttm_bo_mem_put(struct ttm_buffer_object *bo, struct ttm_mem_reg *mem);
void ttm_bo_mem_put_locked(struct ttm_buffer_object *bo, void ttm_bo_mem_put_locked(struct ttm_buffer_object *bo,
struct ttm_mem_reg *mem); struct ttm_mem_reg *mem);
void ttm_bo_global_release(struct ttm_bo_global *glob); void ttm_bo_global_release(void);
int ttm_bo_global_init(struct ttm_bo_global *glob); int ttm_bo_global_init(void);
int ttm_bo_device_release(struct ttm_bo_device *bdev); int ttm_bo_device_release(struct ttm_bo_device *bdev);
@ -906,7 +907,7 @@ struct ttm_bo_global_ref {
*/ */
static inline int ttm_bo_global_ref_init(struct drm_global_reference *ref) static inline int ttm_bo_global_ref_init(struct drm_global_reference *ref)
{ {
return ttm_bo_global_init(ref->object); return ttm_bo_global_init();
} }
/** /**
@ -920,7 +921,7 @@ static inline int ttm_bo_global_ref_init(struct drm_global_reference *ref)
*/ */
static inline void ttm_bo_global_ref_release(struct drm_global_reference *ref) static inline void ttm_bo_global_ref_release(struct drm_global_reference *ref)
{ {
ttm_bo_global_release(ref->object); ttm_bo_global_release();
} }
#endif #endif