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

drm/ttm: remove TTM_MEMTYPE_FLAG_FIXED v2 



Instead use a boolean field in the memory manager structure.

Also invert the meaning of the field since the use of a TT
structure is the special case here.

v2: cleanup zero init.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/382079/
parent 418d2ad1

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

+1 −3
Original line number Diff line number Diff line
@@ -87,15 +87,14 @@ static int amdgpu_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, 
		break;

	case TTM_PL_TT:

		/* GTT memory  */

		man->use_tt = true;

		man->func = &amdgpu_gtt_mgr_func;

		man->available_caching = TTM_PL_MASK_CACHING;

		man->default_caching = TTM_PL_FLAG_CACHED;

		man->flags = 0;

		break;

	case TTM_PL_VRAM:

		/* "On-card" video ram */

		man->func = &amdgpu_vram_mgr_func;

		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;
@@ -104,7 +103,6 @@ static int amdgpu_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, 
	case AMDGPU_PL_OA:

		/* On-chip GDS memory*/

		man->func = &ttm_bo_manager_func;

		man->flags = TTM_MEMTYPE_FLAG_FIXED;

		man->available_caching = TTM_PL_FLAG_UNCACHED;

		man->default_caching = TTM_PL_FLAG_UNCACHED;

		break;

drivers/gpu/drm/drm_gem_vram_helper.c

+0 −1
Original line number Diff line number Diff line
@@ -1012,7 +1012,6 @@ static int bo_driver_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, 
		break;

	case TTM_PL_VRAM:

		man->func = &ttm_bo_manager_func;

		man->flags = TTM_MEMTYPE_FLAG_FIXED;

		man->available_caching = TTM_PL_FLAG_UNCACHED |

					 TTM_PL_FLAG_WC;

		man->default_caching = TTM_PL_FLAG_WC;

drivers/gpu/drm/nouveau/nouveau_bo.c

+1 −3
Original line number Diff line number Diff line
@@ -657,7 +657,6 @@ nouveau_bo_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, 
	case TTM_PL_SYSTEM:

		break;

	case TTM_PL_VRAM:

		man->flags = TTM_MEMTYPE_FLAG_FIXED;

		man->available_caching = TTM_PL_FLAG_UNCACHED |

					 TTM_PL_FLAG_WC;

		man->default_caching = TTM_PL_FLAG_WC;
@@ -685,13 +684,12 @@ nouveau_bo_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, 
		else

			man->func = &ttm_bo_manager_func;



		man->use_tt = true;

		if (drm->agp.bridge) {

			man->flags = 0;

			man->available_caching = TTM_PL_FLAG_UNCACHED |

				TTM_PL_FLAG_WC;

			man->default_caching = TTM_PL_FLAG_WC;

		} else {

			man->flags = 0;

			man->available_caching = TTM_PL_MASK_CACHING;

			man->default_caching = TTM_PL_FLAG_CACHED;

		}

drivers/gpu/drm/qxl/qxl_ttm.c

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ static int qxl_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, 
	case TTM_PL_PRIV:

		/* "On-card" video ram */

		man->func = &ttm_bo_manager_func;

		man->flags = TTM_MEMTYPE_FLAG_FIXED;

		man->available_caching = TTM_PL_MASK_CACHING;

		man->default_caching = TTM_PL_FLAG_CACHED;

		break;

drivers/gpu/drm/radeon/radeon_ttm.c

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

		man->use_tt = true;

#if IS_ENABLED(CONFIG_AGP)

		if (rdev->flags & RADEON_IS_AGP) {

			if (!rdev->ddev->agp) {
@@ -98,7 +98,6 @@ 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;

		man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;

		man->default_caching = TTM_PL_FLAG_WC;

		break;