diff options
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_memory.c | 1 | ||||
-rw-r--r-- | include/drm/ttm/ttm_memory.h | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c index 479c6b0467ca..dbc2def887cd 100644 --- a/drivers/gpu/drm/ttm/ttm_memory.c +++ b/drivers/gpu/drm/ttm/ttm_memory.c | |||
@@ -367,7 +367,6 @@ int ttm_mem_global_init(struct ttm_mem_global *glob) | |||
367 | spin_lock_init(&glob->lock); | 367 | spin_lock_init(&glob->lock); |
368 | glob->swap_queue = create_singlethread_workqueue("ttm_swap"); | 368 | glob->swap_queue = create_singlethread_workqueue("ttm_swap"); |
369 | INIT_WORK(&glob->work, ttm_shrink_work); | 369 | INIT_WORK(&glob->work, ttm_shrink_work); |
370 | init_waitqueue_head(&glob->queue); | ||
371 | ret = kobject_init_and_add( | 370 | ret = kobject_init_and_add( |
372 | &glob->kobj, &ttm_mem_glob_kobj_type, ttm_get_kobj(), "memory_accounting"); | 371 | &glob->kobj, &ttm_mem_glob_kobj_type, ttm_get_kobj(), "memory_accounting"); |
373 | if (unlikely(ret != 0)) { | 372 | if (unlikely(ret != 0)) { |
diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h index d6d1da468c97..72dcbe81dd07 100644 --- a/include/drm/ttm/ttm_memory.h +++ b/include/drm/ttm/ttm_memory.h | |||
@@ -60,7 +60,6 @@ struct ttm_mem_shrink { | |||
60 | * for the GPU, and this will otherwise block other workqueue tasks(?) | 60 | * for the GPU, and this will otherwise block other workqueue tasks(?) |
61 | * At this point we use only a single-threaded workqueue. | 61 | * At this point we use only a single-threaded workqueue. |
62 | * @work: The workqueue callback for the shrink queue. | 62 | * @work: The workqueue callback for the shrink queue. |
63 | * @queue: Wait queue for processes suspended waiting for memory. | ||
64 | * @lock: Lock to protect the @shrink - and the memory accounting members, | 63 | * @lock: Lock to protect the @shrink - and the memory accounting members, |
65 | * that is, essentially the whole structure with some exceptions. | 64 | * that is, essentially the whole structure with some exceptions. |
66 | * @zones: Array of pointers to accounting zones. | 65 | * @zones: Array of pointers to accounting zones. |
@@ -80,7 +79,6 @@ struct ttm_mem_global { | |||
80 | struct ttm_mem_shrink *shrink; | 79 | struct ttm_mem_shrink *shrink; |
81 | struct workqueue_struct *swap_queue; | 80 | struct workqueue_struct *swap_queue; |
82 | struct work_struct work; | 81 | struct work_struct work; |
83 | wait_queue_head_t queue; | ||
84 | spinlock_t lock; | 82 | spinlock_t lock; |
85 | struct ttm_mem_zone *zones[TTM_MEM_MAX_ZONES]; | 83 | struct ttm_mem_zone *zones[TTM_MEM_MAX_ZONES]; |
86 | unsigned int num_zones; | 84 | unsigned int num_zones; |