drm/radeon: stop implementing init_mem_type

Instead just initialize the memory type parameters
before calling ttm_bo_init_mm.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/382080/

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 9aba18a143e7183a43638d4c8210e95960ebbc3e..b0b59c55378566a1b4e6ac5adfbd02fb24c90b86 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -69,43 +69,43 @@ struct radeon_device *radeon_get_rdev(struct ttm_bo_device *bdev)
 static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
                                struct ttm_mem_type_manager *man)
 {
-       struct radeon_device *rdev;
+       return 0;
+}
 
-       rdev = radeon_get_rdev(bdev);
+static int radeon_ttm_init_vram(struct radeon_device *rdev)
+{
+       struct ttm_mem_type_manager *man = &rdev->mman.bdev.man[TTM_PL_VRAM];
 
-       switch (type) {
-       case TTM_PL_SYSTEM:
-               /* System memory */
-               break;
-       case TTM_PL_TT:
-               man->func = &ttm_bo_manager_func;
-               man->available_caching = TTM_PL_MASK_CACHING;
-               man->default_caching = TTM_PL_FLAG_CACHED;
-               man->use_tt = true;
+       man->func = &ttm_bo_manager_func;
+       man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
+       man->default_caching = TTM_PL_FLAG_WC;
+
+       return ttm_bo_init_mm(&rdev->mman.bdev, TTM_PL_VRAM,
+                             rdev->mc.real_vram_size >> PAGE_SHIFT);
+}
+
+static int radeon_ttm_init_gtt(struct radeon_device *rdev)
+{
+       struct ttm_mem_type_manager *man = &rdev->mman.bdev.man[TTM_PL_TT];
+
+       man->func = &ttm_bo_manager_func;
+       man->available_caching = TTM_PL_MASK_CACHING;
+       man->default_caching = TTM_PL_FLAG_CACHED;
+       man->use_tt = true;
 #if IS_ENABLED(CONFIG_AGP)
-               if (rdev->flags & RADEON_IS_AGP) {
-                       if (!rdev->ddev->agp) {
-                               DRM_ERROR("AGP is not enabled for memory type %u\n",
-                                         (unsigned)type);
-                               return -EINVAL;
-                       }
-                       man->available_caching = TTM_PL_FLAG_UNCACHED |
-                                                TTM_PL_FLAG_WC;
-                       man->default_caching = TTM_PL_FLAG_WC;
+       if (rdev->flags & RADEON_IS_AGP) {
+               if (!rdev->ddev->agp) {
+                       DRM_ERROR("AGP is not enabled\n");
+                       return -EINVAL;
                }
-#endif
-               break;
-       case TTM_PL_VRAM:
-               /* "On-card" video ram */
-               man->func = &ttm_bo_manager_func;
-               man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
+               man->available_caching = TTM_PL_FLAG_UNCACHED |
+                                        TTM_PL_FLAG_WC;
                man->default_caching = TTM_PL_FLAG_WC;
-               break;
-       default:
-               DRM_ERROR("Unsupported memory type %u\n", (unsigned)type);
-               return -EINVAL;
        }
-       return 0;
+#endif
+
+       return ttm_bo_init_mm(&rdev->mman.bdev, TTM_PL_TT,
+                             rdev->mc.gtt_size >> PAGE_SHIFT);
 }
 
 static void radeon_evict_flags(struct ttm_buffer_object *bo,
@@ -778,8 +778,8 @@ int radeon_ttm_init(struct radeon_device *rdev)
                return r;
        }
        rdev->mman.initialized = true;
-       r = ttm_bo_init_mm(&rdev->mman.bdev, TTM_PL_VRAM,
-                               rdev->mc.real_vram_size >> PAGE_SHIFT);
+
+       r = radeon_ttm_init_vram(rdev);
        if (r) {
                DRM_ERROR("Failed initializing VRAM heap.\n");
                return r;
@@ -804,8 +804,8 @@ int radeon_ttm_init(struct radeon_device *rdev)
        }
        DRM_INFO("radeon: %uM of VRAM memory ready\n",
                 (unsigned) (rdev->mc.real_vram_size / (1024 * 1024)));
-       r = ttm_bo_init_mm(&rdev->mman.bdev, TTM_PL_TT,
-                               rdev->mc.gtt_size >> PAGE_SHIFT);
+
+       r = radeon_ttm_init_gtt(rdev);
        if (r) {
                DRM_ERROR("Failed initializing GTT heap.\n");
                return r;