[PATCH v6 04/45] drm/ttm: dynamically allocate the drm-ttm_pool shrinker

[Qi Zheng]

Use new APIs to dynamically allocate the drm-ttm_pool shrinker.

Signed-off-by: Qi Zheng <zhengqi.a...@bytedance.com>
Reviewed-by: Muchun Song <songmuc...@bytedance.com>
Acked-by: Daniel Vetter <daniel.vet...@ffwll.ch>
CC: Christian Koenig <christian.koe...@amd.com>
CC: Huang Rui <ray.hu...@amd.com>
CC: David Airlie <airl...@gmail.com>
CC: dri-devel@lists.freedesktop.org
---
 drivers/gpu/drm/ttm/ttm_pool.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.c
index 648ca70403a7..fe610a3cace0 100644
--- a/drivers/gpu/drm/ttm/ttm_pool.c
+++ b/drivers/gpu/drm/ttm/ttm_pool.c
@@ -73,7 +73,7 @@ static struct ttm_pool_type global_dma32_uncached[MAX_ORDER + 
1];
 
 static spinlock_t shrinker_lock;
 static struct list_head shrinker_list;
-static struct shrinker mm_shrinker;
+static struct shrinker *mm_shrinker;
 static DECLARE_RWSEM(pool_shrink_rwsem);
 
 /* Allocate pages of size 1 << order with the given gfp_flags */
@@ -749,8 +749,8 @@ static int ttm_pool_debugfs_shrink_show(struct seq_file *m, 
void *data)
        struct shrink_control sc = { .gfp_mask = GFP_NOFS };
 
        fs_reclaim_acquire(GFP_KERNEL);
-       seq_printf(m, "%lu/%lu\n", ttm_pool_shrinker_count(&mm_shrinker, &sc),
-                  ttm_pool_shrinker_scan(&mm_shrinker, &sc));
+       seq_printf(m, "%lu/%lu\n", ttm_pool_shrinker_count(mm_shrinker, &sc),
+                  ttm_pool_shrinker_scan(mm_shrinker, &sc));
        fs_reclaim_release(GFP_KERNEL);
 
        return 0;
@@ -794,10 +794,17 @@ int ttm_pool_mgr_init(unsigned long num_pages)
                            &ttm_pool_debugfs_shrink_fops);
 #endif
 
-       mm_shrinker.count_objects = ttm_pool_shrinker_count;
-       mm_shrinker.scan_objects = ttm_pool_shrinker_scan;
-       mm_shrinker.seeks = 1;
-       return register_shrinker(&mm_shrinker, "drm-ttm_pool");
+       mm_shrinker = shrinker_alloc(0, "drm-ttm_pool");
+       if (!mm_shrinker)
+               return -ENOMEM;
+
+       mm_shrinker->count_objects = ttm_pool_shrinker_count;
+       mm_shrinker->scan_objects = ttm_pool_shrinker_scan;
+       mm_shrinker->seeks = 1;
+
+       shrinker_register(mm_shrinker);
+
+       return 0;
 }
 
 /**
@@ -817,6 +824,6 @@ void ttm_pool_mgr_fini(void)
                ttm_pool_type_fini(&global_dma32_uncached[i]);
        }
 
-       unregister_shrinker(&mm_shrinker);
+       shrinker_free(mm_shrinker);
        WARN_ON(!list_empty(&shrinker_list));
 }
-- 
2.30.2