drm/radeon: stop using TTM_MEMTYPE_FLAG_MAPPABLE (8401e2ed) · Commits · 戴 / test

drivers/gpu/drm/radeon/radeon_ttm.c

+4 −9

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
		switch (type) {
		case TTM_PL_SYSTEM:
		/* System memory */
		man->flags = TTM_MEMTYPE_FLAG_MAPPABLE;
		man->flags = 0;
		man->available_caching = TTM_PL_MASK_CACHING;
		man->default_caching = TTM_PL_FLAG_CACHED;
		break;
		@@ -84,7 +84,7 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
		man->func = &ttm_bo_manager_func;
		man->available_caching = TTM_PL_MASK_CACHING;
		man->default_caching = TTM_PL_FLAG_CACHED;
		man->flags = TTM_MEMTYPE_FLAG_MAPPABLE;
		man->flags = 0;
		#if IS_ENABLED(CONFIG_AGP)
		if (rdev->flags & RADEON_IS_AGP) {
		if (!rdev->ddev->agp) {
		@@ -92,8 +92,6 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
		(unsigned)type);
		return -EINVAL;
		}
		if (!rdev->ddev->agp->cant_use_aperture)
		man->flags = TTM_MEMTYPE_FLAG_MAPPABLE;
		man->available_caching = TTM_PL_FLAG_UNCACHED \|
		TTM_PL_FLAG_WC;
		man->default_caching = TTM_PL_FLAG_WC;
		@@ -103,8 +101,7 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
		case TTM_PL_VRAM:
		/* "On-card" video ram */
		man->func = &ttm_bo_manager_func;
		man->flags = TTM_MEMTYPE_FLAG_FIXED \|
		TTM_MEMTYPE_FLAG_MAPPABLE;
		man->flags = TTM_MEMTYPE_FLAG_FIXED;
		man->available_caching = TTM_PL_FLAG_UNCACHED \| TTM_PL_FLAG_WC;
		man->default_caching = TTM_PL_FLAG_WC;
		break;
		@@ -394,7 +391,6 @@ memcpy:

		static int radeon_ttm_io_mem_reserve(struct ttm_bo_device bdev, struct ttm_mem_reg mem)
		{
		struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
		struct radeon_device *rdev = radeon_get_rdev(bdev);

		mem->bus.addr = NULL;
		@@ -402,8 +398,7 @@ static int radeon_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_
		mem->bus.size = mem->num_pages << PAGE_SHIFT;
		mem->bus.base = 0;
		mem->bus.is_iomem = false;
		if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE))
		return -EINVAL;

		switch (mem->mem_type) {
		case TTM_PL_SYSTEM:
		/* system memory */

Admin message