Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56b3d204 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/ttm: make the device list mutex static 



This way it can protect the whole BO global state.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 27eb1fa9

drivers/gpu/drm/ttm/ttm_bo.c

+9 −5
Original line number Diff line number Diff line
@@ -45,6 +45,11 @@ 


static void ttm_bo_global_kobj_release(struct kobject *kobj);



/**

 * ttm_global_mutex - protecting the global BO state

 */

DEFINE_MUTEX(ttm_global_mutex);



static struct attribute ttm_bo_count = {

	.name = "bo_count",

	.mode = S_IRUGO
@@ -1539,7 +1544,6 @@ int ttm_bo_global_init(struct ttm_bo_global *glob) 
	if (ret)

		return ret;



	mutex_init(&glob->device_list_mutex);

	spin_lock_init(&glob->lru_lock);

	glob->mem_glob = &ttm_mem_glob;

	glob->mem_glob->bo_glob = glob;
@@ -1587,9 +1591,9 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev) 
		}

	}



	mutex_lock(&glob->device_list_mutex);

	mutex_lock(&ttm_global_mutex);

	list_del(&bdev->device_list);

	mutex_unlock(&glob->device_list_mutex);

	mutex_unlock(&ttm_global_mutex);



	cancel_delayed_work_sync(&bdev->wq);
@@ -1636,9 +1640,9 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev, 
	bdev->dev_mapping = mapping;

	bdev->glob = glob;

	bdev->need_dma32 = need_dma32;

	mutex_lock(&glob->device_list_mutex);

	mutex_lock(&ttm_global_mutex);

	list_add_tail(&bdev->device_list, &glob->device_list);

	mutex_unlock(&glob->device_list_mutex);

	mutex_unlock(&ttm_global_mutex);



	return 0;

out_no_sys:

include/drm/ttm/ttm_bo_driver.h

+0 −1
Original line number Diff line number Diff line
@@ -407,7 +407,6 @@ struct ttm_bo_global { 
	struct kobject kobj;

	struct ttm_mem_global *mem_glob;

	struct page *dummy_read_page;

	struct mutex device_list_mutex;

	spinlock_t lru_lock;



	/**