openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Kent Russell 2017-08-08 07:50:46 -04:00 committed by Alex Deucher
parent 6d7d9c5aa2
commit 5dcd33459b
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/radeon/radeon.h
View File

@ -464,7 +464,7 @@ struct radeon_bo_list {
struct radeon_bo *robj; struct radeon_bo *robj;
struct ttm_validate_buffer tv; struct ttm_validate_buffer tv;
uint64_t gpu_offset; uint64_t gpu_offset;
unsigned prefered_domains; unsigned preferred_domains;
unsigned allowed_domains; unsigned allowed_domains;
uint32_t tiling_flags; uint32_t tiling_flags;
}; };

8
drivers/gpu/drm/radeon/radeon_cs.c
View File

@ -130,7 +130,7 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
p->rdev->family == CHIP_RS880)) { p->rdev->family == CHIP_RS880)) {
/* TODO: is this still needed for NI+ ? */ /* TODO: is this still needed for NI+ ? */
p->relocs[i].prefered_domains = p->relocs[i].preferred_domains =
RADEON_GEM_DOMAIN_VRAM; RADEON_GEM_DOMAIN_VRAM;
p->relocs[i].allowed_domains = p->relocs[i].allowed_domains =
@ -148,14 +148,14 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
return -EINVAL; return -EINVAL;
} }
p->relocs[i].prefered_domains = domain; p->relocs[i].preferred_domains = domain;
if (domain == RADEON_GEM_DOMAIN_VRAM) if (domain == RADEON_GEM_DOMAIN_VRAM)
domain |= RADEON_GEM_DOMAIN_GTT; domain |= RADEON_GEM_DOMAIN_GTT;
p->relocs[i].allowed_domains = domain; p->relocs[i].allowed_domains = domain;
} }
if (radeon_ttm_tt_has_userptr(p->relocs[i].robj->tbo.ttm)) { if (radeon_ttm_tt_has_userptr(p->relocs[i].robj->tbo.ttm)) {
uint32_t domain = p->relocs[i].prefered_domains; uint32_t domain = p->relocs[i].preferred_domains;
if (!(domain & RADEON_GEM_DOMAIN_GTT)) { if (!(domain & RADEON_GEM_DOMAIN_GTT)) {
DRM_ERROR("Only RADEON_GEM_DOMAIN_GTT is " DRM_ERROR("Only RADEON_GEM_DOMAIN_GTT is "
"allowed for userptr BOs\n"); "allowed for userptr BOs\n");
@ -163,7 +163,7 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
} }
need_mmap_lock = true; need_mmap_lock = true;
domain = RADEON_GEM_DOMAIN_GTT; domain = RADEON_GEM_DOMAIN_GTT;
p->relocs[i].prefered_domains = domain; p->relocs[i].preferred_domains = domain;
p->relocs[i].allowed_domains = domain; p->relocs[i].allowed_domains = domain;
} }

2
drivers/gpu/drm/radeon/radeon_object.c
View File

@ -546,7 +546,7 @@ int radeon_bo_list_validate(struct radeon_device *rdev,
list_for_each_entry(lobj, head, tv.head) { list_for_each_entry(lobj, head, tv.head) {
struct radeon_bo *bo = lobj->robj; struct radeon_bo *bo = lobj->robj;
if (!bo->pin_count) { if (!bo->pin_count) {
u32 domain = lobj->prefered_domains; u32 domain = lobj->preferred_domains;
u32 allowed = lobj->allowed_domains; u32 allowed = lobj->allowed_domains;
u32 current_domain = u32 current_domain =
radeon_mem_type_to_domain(bo->tbo.mem.mem_type); radeon_mem_type_to_domain(bo->tbo.mem.mem_type);

4
drivers/gpu/drm/radeon/radeon_vm.c
View File

@ -139,7 +139,7 @@ struct radeon_bo_list *radeon_vm_get_bos(struct radeon_device *rdev,
/* add the vm page table to the list */ /* add the vm page table to the list */
list[0].robj = vm->page_directory; list[0].robj = vm->page_directory;
list[0].prefered_domains = RADEON_GEM_DOMAIN_VRAM; list[0].preferred_domains = RADEON_GEM_DOMAIN_VRAM;
list[0].allowed_domains = RADEON_GEM_DOMAIN_VRAM; list[0].allowed_domains = RADEON_GEM_DOMAIN_VRAM;
list[0].tv.bo = &vm->page_directory->tbo; list[0].tv.bo = &vm->page_directory->tbo;
list[0].tv.shared = true; list[0].tv.shared = true;
@ -151,7 +151,7 @@ struct radeon_bo_list *radeon_vm_get_bos(struct radeon_device *rdev,
continue; continue;
list[idx].robj = vm->page_tables[i].bo; list[idx].robj = vm->page_tables[i].bo;
list[idx].prefered_domains = RADEON_GEM_DOMAIN_VRAM; list[idx].preferred_domains = RADEON_GEM_DOMAIN_VRAM;
list[idx].allowed_domains = RADEON_GEM_DOMAIN_VRAM; list[idx].allowed_domains = RADEON_GEM_DOMAIN_VRAM;
list[idx].tv.bo = &list[idx].robj->tbo; list[idx].tv.bo = &list[idx].robj->tbo;
list[idx].tv.shared = true; list[idx].tv.shared = true;