tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/amdgpu: stop using TTM_MEMTYPE_FLAG_MAPPABLE
The driver does support some not-mapable resources, but
those are already handled correctly in the switch/case
statement in the code.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/378243/
+4
-7
+4
-7
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+4
-7
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
···
84
84
switch (type) {
85
85
case TTM_PL_SYSTEM:
86
86
/* System memory */
87
-
man->flags = TTM_MEMTYPE_FLAG_MAPPABLE;
87
+
man->flags = 0;
88
88
man->available_caching = TTM_PL_MASK_CACHING;
89
89
man->default_caching = TTM_PL_FLAG_CACHED;
90
90
break;
···
93
93
man->func = &amdgpu_gtt_mgr_func;
94
94
man->available_caching = TTM_PL_MASK_CACHING;
95
95
man->default_caching = TTM_PL_FLAG_CACHED;
96
-
man->flags = TTM_MEMTYPE_FLAG_MAPPABLE;
96
+
man->flags = 0;
97
97
break;
98
98
case TTM_PL_VRAM:
99
99
/* "On-card" video ram */
100
100
man->func = &amdgpu_vram_mgr_func;
101
-
man->flags = TTM_MEMTYPE_FLAG_FIXED |
102
-
TTM_MEMTYPE_FLAG_MAPPABLE;
101
+
man->flags = TTM_MEMTYPE_FLAG_FIXED;
103
102
man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
104
103
man->default_caching = TTM_PL_FLAG_WC;
105
104
break;
···
795
796
*/
796
797
static int amdgpu_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
797
798
{
798
-
struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
799
799
struct amdgpu_device *adev = amdgpu_ttm_adev(bdev);
800
800
struct drm_mm_node *mm_node = mem->mm_node;
801
801
···
803
805
mem->bus.size = mem->num_pages << PAGE_SHIFT;
804
806
mem->bus.base = 0;
805
807
mem->bus.is_iomem = false;
806
-
if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE))
807
-
return -EINVAL;
808
+
808
809
switch (mem->mem_type) {
809
810
case TTM_PL_SYSTEM:
810
811
/* system memory */