Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/radeon: Fix preferred typo

Change "prefered" to "preferred"

Signed-off-by: Kent Russell <kent.russell@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Kent Russell and committed by
Alex Deucher
5dcd3345 6d7d9c5a

+8 -8
+1 -1
drivers/gpu/drm/radeon/radeon.h
··· 464 464 struct radeon_bo *robj; 465 465 struct ttm_validate_buffer tv; 466 466 uint64_t gpu_offset; 467 - unsigned prefered_domains; 467 + unsigned preferred_domains; 468 468 unsigned allowed_domains; 469 469 uint32_t tiling_flags; 470 470 };
+4 -4
drivers/gpu/drm/radeon/radeon_cs.c
··· 130 130 p->rdev->family == CHIP_RS880)) { 131 131 132 132 /* TODO: is this still needed for NI+ ? */ 133 - p->relocs[i].prefered_domains = 133 + p->relocs[i].preferred_domains = 134 134 RADEON_GEM_DOMAIN_VRAM; 135 135 136 136 p->relocs[i].allowed_domains = ··· 148 148 return -EINVAL; 149 149 } 150 150 151 - p->relocs[i].prefered_domains = domain; 151 + p->relocs[i].preferred_domains = domain; 152 152 if (domain == RADEON_GEM_DOMAIN_VRAM) 153 153 domain |= RADEON_GEM_DOMAIN_GTT; 154 154 p->relocs[i].allowed_domains = domain; 155 155 } 156 156 157 157 if (radeon_ttm_tt_has_userptr(p->relocs[i].robj->tbo.ttm)) { 158 - uint32_t domain = p->relocs[i].prefered_domains; 158 + uint32_t domain = p->relocs[i].preferred_domains; 159 159 if (!(domain & RADEON_GEM_DOMAIN_GTT)) { 160 160 DRM_ERROR("Only RADEON_GEM_DOMAIN_GTT is " 161 161 "allowed for userptr BOs\n"); ··· 163 163 } 164 164 need_mmap_lock = true; 165 165 domain = RADEON_GEM_DOMAIN_GTT; 166 - p->relocs[i].prefered_domains = domain; 166 + p->relocs[i].preferred_domains = domain; 167 167 p->relocs[i].allowed_domains = domain; 168 168 } 169 169
+1 -1
drivers/gpu/drm/radeon/radeon_object.c
··· 546 546 list_for_each_entry(lobj, head, tv.head) { 547 547 struct radeon_bo *bo = lobj->robj; 548 548 if (!bo->pin_count) { 549 - u32 domain = lobj->prefered_domains; 549 + u32 domain = lobj->preferred_domains; 550 550 u32 allowed = lobj->allowed_domains; 551 551 u32 current_domain = 552 552 radeon_mem_type_to_domain(bo->tbo.mem.mem_type);
+2 -2
drivers/gpu/drm/radeon/radeon_vm.c
··· 139 139 140 140 /* add the vm page table to the list */ 141 141 list[0].robj = vm->page_directory; 142 - list[0].prefered_domains = RADEON_GEM_DOMAIN_VRAM; 142 + list[0].preferred_domains = RADEON_GEM_DOMAIN_VRAM; 143 143 list[0].allowed_domains = RADEON_GEM_DOMAIN_VRAM; 144 144 list[0].tv.bo = &vm->page_directory->tbo; 145 145 list[0].tv.shared = true; ··· 151 151 continue; 152 152 153 153 list[idx].robj = vm->page_tables[i].bo; 154 - list[idx].prefered_domains = RADEON_GEM_DOMAIN_VRAM; 154 + list[idx].preferred_domains = RADEON_GEM_DOMAIN_VRAM; 155 155 list[idx].allowed_domains = RADEON_GEM_DOMAIN_VRAM; 156 156 list[idx].tv.bo = &list[idx].robj->tbo; 157 157 list[idx].tv.shared = true;