Commit 47c0550f authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/radeon/ttm: use wrapper to access memory manager 



Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200804025632.3868079-42-airlied@gmail.com
parent 3d3b4fb9

drivers/gpu/drm/radeon/radeon_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ int radeon_gem_info_ioctl(struct drm_device *dev, void *data, 
	struct drm_radeon_gem_info *args = data;

	struct ttm_mem_type_manager *man;



	man = &rdev->mman.bdev.man[TTM_PL_VRAM];

	man = ttm_manager_type(&rdev->mman.bdev, TTM_PL_VRAM);



	args->vram_size = (u64)man->size << PAGE_SHIFT;

	args->vram_visible = rdev->mc.visible_vram_size;

drivers/gpu/drm/radeon/radeon_ttm.c

+6 −6
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ struct radeon_device *radeon_get_rdev(struct ttm_bo_device *bdev) 


static int radeon_ttm_init_vram(struct radeon_device *rdev)

{

	struct ttm_mem_type_manager *man = &rdev->mman.bdev.man[TTM_PL_VRAM];

	struct ttm_mem_type_manager *man = ttm_manager_type(&rdev->mman.bdev, TTM_PL_VRAM);



	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;

	man->default_caching = TTM_PL_FLAG_WC;
@@ -79,7 +79,7 @@ static int radeon_ttm_init_vram(struct radeon_device *rdev) 


static int radeon_ttm_init_gtt(struct radeon_device *rdev)

{

	struct ttm_mem_type_manager *man = &rdev->mman.bdev.man[TTM_PL_TT];

	struct ttm_mem_type_manager *man = ttm_manager_type(&rdev->mman.bdev, TTM_PL_TT);



	man->available_caching = TTM_PL_MASK_CACHING;

	man->default_caching = TTM_PL_FLAG_CACHED;
@@ -827,8 +827,8 @@ void radeon_ttm_fini(struct radeon_device *rdev) 
		}

		radeon_bo_unref(&rdev->stolen_vga_memory);

	}

	ttm_range_man_fini(&rdev->mman.bdev, &rdev->mman.bdev.man[TTM_PL_VRAM]);

	ttm_range_man_fini(&rdev->mman.bdev, &rdev->mman.bdev.man[TTM_PL_TT]);

	ttm_range_man_fini(&rdev->mman.bdev, ttm_manager_type(&rdev->mman.bdev, TTM_PL_VRAM));

	ttm_range_man_fini(&rdev->mman.bdev, ttm_manager_type(&rdev->mman.bdev, TTM_PL_TT));

	ttm_bo_device_release(&rdev->mman.bdev);

	radeon_gart_fini(rdev);

	rdev->mman.initialized = false;
@@ -844,7 +844,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size) 
	if (!rdev->mman.initialized)

		return;



	man = &rdev->mman.bdev.man[TTM_PL_VRAM];

	man = ttm_manager_type(&rdev->mman.bdev, TTM_PL_VRAM);

	/* this just adjusts TTM size idea, which sets lpfn to the correct value */

	man->size = size >> PAGE_SHIFT;

}
@@ -898,7 +898,7 @@ static int radeon_mm_dump_table(struct seq_file *m, void *data) 
	unsigned ttm_pl = *(int*)node->info_ent->data;

	struct drm_device *dev = node->minor->dev;

	struct radeon_device *rdev = dev->dev_private;

	struct ttm_mem_type_manager *man = &rdev->mman.bdev.man[ttm_pl];

	struct ttm_mem_type_manager *man = ttm_manager_type(&rdev->mman.bdev, ttm_pl);

	struct drm_printer p = drm_seq_file_printer(m);



	man->func->debug(man, &p);