Commit 91926741 authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Dave Airlie

drm/ttm: remove ttm_mem_global->queue

It's unused.
Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Reviewed-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 830e2837
...@@ -367,7 +367,6 @@ int ttm_mem_global_init(struct ttm_mem_global *glob) ...@@ -367,7 +367,6 @@ int ttm_mem_global_init(struct ttm_mem_global *glob)
spin_lock_init(&glob->lock); spin_lock_init(&glob->lock);
glob->swap_queue = create_singlethread_workqueue("ttm_swap"); glob->swap_queue = create_singlethread_workqueue("ttm_swap");
INIT_WORK(&glob->work, ttm_shrink_work); INIT_WORK(&glob->work, ttm_shrink_work);
init_waitqueue_head(&glob->queue);
ret = kobject_init_and_add( ret = kobject_init_and_add(
&glob->kobj, &ttm_mem_glob_kobj_type, ttm_get_kobj(), "memory_accounting"); &glob->kobj, &ttm_mem_glob_kobj_type, ttm_get_kobj(), "memory_accounting");
if (unlikely(ret != 0)) { if (unlikely(ret != 0)) {
......
...@@ -60,7 +60,6 @@ struct ttm_mem_shrink { ...@@ -60,7 +60,6 @@ struct ttm_mem_shrink {
* for the GPU, and this will otherwise block other workqueue tasks(?) * for the GPU, and this will otherwise block other workqueue tasks(?)
* At this point we use only a single-threaded workqueue. * At this point we use only a single-threaded workqueue.
* @work: The workqueue callback for the shrink queue. * @work: The workqueue callback for the shrink queue.
* @queue: Wait queue for processes suspended waiting for memory.
* @lock: Lock to protect the @shrink - and the memory accounting members, * @lock: Lock to protect the @shrink - and the memory accounting members,
* that is, essentially the whole structure with some exceptions. * that is, essentially the whole structure with some exceptions.
* @zones: Array of pointers to accounting zones. * @zones: Array of pointers to accounting zones.
...@@ -80,7 +79,6 @@ struct ttm_mem_global { ...@@ -80,7 +79,6 @@ struct ttm_mem_global {
struct ttm_mem_shrink *shrink; struct ttm_mem_shrink *shrink;
struct workqueue_struct *swap_queue; struct workqueue_struct *swap_queue;
struct work_struct work; struct work_struct work;
wait_queue_head_t queue;
spinlock_t lock; spinlock_t lock;
struct ttm_mem_zone *zones[TTM_MEM_MAX_ZONES]; struct ttm_mem_zone *zones[TTM_MEM_MAX_ZONES];
unsigned int num_zones; unsigned int num_zones;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment