drm/ttm: rename manager variable to make sure wrapper is used.

Other users of this should notice this change and switch to wrapper.

Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200804025632.3868079-44-airlied@gmail.com

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 7474679..4d87ee9 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1615,7 +1615,7 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev,
 
        bdev->driver = driver;
 
-       memset(bdev->man, 0, sizeof(bdev->man));
+       memset(bdev->man_priv, 0, sizeof(bdev->man_priv));
 
        ttm_bo_init_sysman(bdev);
 

diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index c8ea5ea..f97c047 100644 (file)
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -415,7 +415,10 @@ struct ttm_bo_device {
         */
        struct list_head device_list;
        struct ttm_bo_driver *driver;
-       struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
+       /*
+        * access via ttm_manager_type.
+        */
+       struct ttm_mem_type_manager man_priv[TTM_NUM_MEM_TYPES];
 
        /*
         * Protected by internal locks.
@@ -447,7 +450,7 @@ struct ttm_bo_device {
 static inline struct ttm_mem_type_manager *ttm_manager_type(struct ttm_bo_device *bdev,
                                                            int mem_type)
 {
-       return &bdev->man[mem_type];
+       return &bdev->man_priv[mem_type];
 }
 
 /**