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

drm/ttm: remove default caching 



As far as I can tell this was never used either and we just
always fallback to the order cached > wc > uncached anyway.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/390142/
parent 46f20630

drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c

+0 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size) 
	man->use_tt = true;

	man->func = &amdgpu_gtt_mgr_func;

	man->available_caching = TTM_PL_MASK_CACHING;

	man->default_caching = TTM_PL_FLAG_CACHED;



	ttm_resource_manager_init(man, gtt_size >> PAGE_SHIFT);

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev, 
				    uint64_t size)

{

	return ttm_range_man_init(&adev->mman.bdev, type,

				  TTM_PL_FLAG_UNCACHED, TTM_PL_FLAG_UNCACHED,

				  TTM_PL_FLAG_UNCACHED,

				  false, size >> PAGE_SHIFT);

}

drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c

+0 −1
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev) 
	int ret;



	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;

	man->default_caching = TTM_PL_FLAG_WC;



	ttm_resource_manager_init(man, adev->gmc.real_vram_size >> PAGE_SHIFT);

drivers/gpu/drm/drm_gem_vram_helper.c

+1 −2
Original line number Diff line number Diff line
@@ -1058,8 +1058,7 @@ static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev, 


	ret = ttm_range_man_init(&vmm->bdev, TTM_PL_VRAM,

				 TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC,

				 TTM_PL_FLAG_WC, false,

				 vram_size >> PAGE_SHIFT);

				 false, vram_size >> PAGE_SHIFT);

	if (ret)

		return ret;

drivers/gpu/drm/nouveau/nouveau_ttm.c

+7 −14
Original line number Diff line number Diff line
@@ -203,12 +203,9 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm) 
			return -ENOMEM;



		man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;

		man->default_caching = TTM_PL_FLAG_WC;



		if (type & NVIF_MEM_UNCACHED) {

		if (type & NVIF_MEM_UNCACHED)

			man->available_caching = TTM_PL_FLAG_UNCACHED;

			man->default_caching = TTM_PL_FLAG_UNCACHED;

		}



		man->func = &nouveau_vram_manager;
@@ -220,7 +217,7 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm) 
	} else {

		return ttm_range_man_init(&drm->ttm.bdev, TTM_PL_VRAM,

					  TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC,

					  TTM_PL_FLAG_WC, false,

					  false,

					  drm->gem.vram_available >> PAGE_SHIFT);

	}

}
@@ -245,16 +242,14 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm) 
{

	struct ttm_resource_manager *man;

	unsigned long size_pages = drm->gem.gart_available >> PAGE_SHIFT;

	unsigned available_caching, default_caching;

	const struct ttm_resource_manager_func *func = NULL;

	if (drm->agp.bridge) {

	unsigned available_caching;



	if (drm->agp.bridge)

		available_caching = TTM_PL_FLAG_UNCACHED |

			TTM_PL_FLAG_WC;

		default_caching = TTM_PL_FLAG_WC;

	} else {

	else

		available_caching = TTM_PL_MASK_CACHING;

		default_caching = TTM_PL_FLAG_CACHED;

	}



	if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA)

		func = &nouveau_gart_manager;
@@ -262,8 +257,7 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm) 
		func = &nv04_gart_manager;

	else

		return ttm_range_man_init(&drm->ttm.bdev, TTM_PL_TT,

					  available_caching, default_caching,

					  true,

					  available_caching, true,

					  size_pages);



	man = kzalloc(sizeof(*man), GFP_KERNEL);
@@ -272,7 +266,6 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm) 


	man->func = func;

	man->available_caching = available_caching;

	man->default_caching = default_caching;

	man->use_tt = true;

	ttm_resource_manager_init(man, size_pages);

	ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_TT, man);

CRA Git | Maintained and supported by SUSTech CRA and CCSE