[PATCH] drm/ttm: Remove create_singlethread_workqueue

[Bhaktipriya Shridhar]

swap_queue was created to handle shrinking in low memory situations.
A separate workqueue was used in order to avoid other workqueue tasks
from being blocked since work items on swap_queue spend a lot of time
waiting for the GPU.

Since these long-running work items aren't involved in memory reclaim in
any way, system_long_wq has been used.

Work item has been flushed in ttm_mem_global_release() to ensure that
nothing is pending when the driver is disconnected.

Signed-off-by: Bhaktipriya Shridhar <bhaktipriya96 at gmail.com>
---
 drivers/gpu/drm/ttm/ttm_memory.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
index a1803fb..b985482 100644
--- a/drivers/gpu/drm/ttm/ttm_memory.c
+++ b/drivers/gpu/drm/ttm/ttm_memory.c
@@ -366,7 +366,6 @@ int ttm_mem_global_init(struct ttm_mem_global *glob)
 	struct ttm_mem_zone *zone;

 	spin_lock_init(&glob->lock);
-	glob->swap_queue = create_singlethread_workqueue("ttm_swap");
 	INIT_WORK(&glob->work, ttm_shrink_work);
 	ret = kobject_init_and_add(
 		&glob->kobj, &ttm_mem_glob_kobj_type, ttm_get_kobj(), "memory_accounting");
@@ -412,9 +411,7 @@ void ttm_mem_global_release(struct ttm_mem_global *glob)
 	ttm_page_alloc_fini();
 	ttm_dma_page_alloc_fini();

-	flush_workqueue(glob->swap_queue);
-	destroy_workqueue(glob->swap_queue);
-	glob->swap_queue = NULL;
+	flush_work(&glob->work);
 	for (i = 0; i < glob->num_zones; ++i) {
 		zone = glob->zones[i];
 		kobject_del(&zone->kobj);
@@ -443,7 +440,7 @@ static void ttm_check_swapping(struct ttm_mem_global *glob)
 	spin_unlock(&glob->lock);

 	if (unlikely(needs_swapping))
-		(void)queue_work(glob->swap_queue, &glob->work);
+		(void)queue_work(system_long_wq, &glob->work);

 }

--
2.1.4