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

drm/ttm: remove available_caching 



Instead of letting TTM make an educated guess based on
some mask all drivers should just specify what caching
they want for their CPU mappings.

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/390207/
parent 5839172f

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

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,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;



	ttm_resource_manager_init(man, gtt_size >> PAGE_SHIFT);

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

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ 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,

				  false, size >> PAGE_SHIFT);

}

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

+0 −2
Original line number Diff line number Diff line
@@ -179,8 +179,6 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev) 
	struct ttm_resource_manager *man = &mgr->manager;

	int ret;



	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;



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



	man->func = &amdgpu_vram_mgr_func;

drivers/gpu/drm/drm_gem_vram_helper.c

+0 −1
Original line number Diff line number Diff line
@@ -1057,7 +1057,6 @@ static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev, 
		return ret;



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

				 TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC,

				 false, vram_size >> PAGE_SHIFT);

	if (ret)

		return ret;

drivers/gpu/drm/nouveau/nouveau_ttm.c

+2 −7
Original line number Diff line number Diff line
@@ -200,7 +200,6 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm) 
		if (!man)

			return -ENOMEM;



		man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;

		man->func = &nouveau_vram_manager;



		ttm_resource_manager_init(man,
@@ -209,9 +208,7 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm) 
		ttm_resource_manager_set_used(man, true);

		return 0;

	} else {

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

					  TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC,

					  false,

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

					  drm->gem.vram_available >> PAGE_SHIFT);

	}

}
@@ -243,8 +240,7 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm) 
	else if (!drm->agp.bridge)

		func = &nv04_gart_manager;

	else

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

					  TTM_PL_MASK_CACHING, true,

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

					  size_pages);



	man = kzalloc(sizeof(*man), GFP_KERNEL);
@@ -252,7 +248,6 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm) 
		return -ENOMEM;



	man->func = func;

	man->available_caching = TTM_PL_MASK_CACHING;

	man->use_tt = true;

	ttm_resource_manager_init(man, size_pages);

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