Commit b0691b34 authored by Christian König's avatar Christian König
Browse files

drm/radeon: stop implementing init_mem_type 



Instead just initialize the memory type parameters
before calling ttm_bo_init_mm.

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

drivers/gpu/drm/radeon/radeon_ttm.c

+35 −35
Original line number Diff line number Diff line
@@ -69,15 +69,25 @@ 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];



	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];



	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;
@@ -85,8 +95,7 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, 
#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);

			DRM_ERROR("AGP is not enabled\n");

			return -EINVAL;

		}

		man->available_caching = TTM_PL_FLAG_UNCACHED |
@@ -94,18 +103,9 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, 
		man->default_caching = TTM_PL_FLAG_WC;

	}

#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->default_caching = TTM_PL_FLAG_WC;

		break;

	default:

		DRM_ERROR("Unsupported memory type %u\n", (unsigned)type);

		return -EINVAL;

	}

	return 0;



	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;