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

drm/vram-helper: 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 avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/382086/
parent ccd0dc43

drivers/gpu/drm/drm_gem_vram_helper.c

+4 −12
Original line number Original line Diff line number Diff line
@@ -1007,18 +1007,6 @@ static struct ttm_tt *bo_driver_ttm_tt_create(struct ttm_buffer_object *bo, 
static int bo_driver_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,

static int bo_driver_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,

				   struct ttm_mem_type_manager *man)

				   struct ttm_mem_type_manager *man)

{

{

	switch (type) {

	case TTM_PL_SYSTEM:

		break;

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

		break;

	default:

		return -EINVAL;

	}

	return 0;

	return 0;

}

}
@@ -1126,6 +1114,7 @@ EXPORT_SYMBOL(drm_vram_mm_debugfs_init); 
static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,

static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,

			    uint64_t vram_base, size_t vram_size)

			    uint64_t vram_base, size_t vram_size)

{

{

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

	int ret;

	int ret;





	vmm->vram_base = vram_base;

	vmm->vram_base = vram_base;
@@ -1138,6 +1127,9 @@ static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev, 
	if (ret)

	if (ret)

		return ret;

		return ret;





	man->func = &ttm_bo_manager_func;

	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;

	man->default_caching = TTM_PL_FLAG_WC;

	ret = ttm_bo_init_mm(&vmm->bdev, TTM_PL_VRAM, vram_size >> PAGE_SHIFT);

	ret = ttm_bo_init_mm(&vmm->bdev, TTM_PL_VRAM, vram_size >> PAGE_SHIFT);

	if (ret)

	if (ret)

		return ret;

		return ret;