hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/radeon: rename alt_domain to allowed_domains 

And also domain to prefered_domains. That matches better
what those values represent.

Signed-off-by: Christian König <christian.koenig@amd.com>
Cc: Marek Olšák <maraeo@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2014-06-02 17:33:07 +02:00 committed by Alex Deucher
parent b5be1a839a
commit ce6758c8bd
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -997,8 +997,8 @@ struct radeon_cs_reloc {
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 domain; unsigned prefered_domains;
unsigned alt_domain; unsigned allowed_domains;
uint32_t tiling_flags; uint32_t tiling_flags;
uint32_t handle; uint32_t handle;
}; };

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

@ -140,10 +140,10 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
if (p->ring == R600_RING_TYPE_UVD_INDEX && if (p->ring == R600_RING_TYPE_UVD_INDEX &&
(i == 0 || drm_pci_device_is_agp(p->rdev->ddev))) { (i == 0 || drm_pci_device_is_agp(p->rdev->ddev))) {
/* TODO: is this still needed for NI+ ? */ /* TODO: is this still needed for NI+ ? */
p->relocs[i].domain = p->relocs[i].prefered_domains =
RADEON_GEM_DOMAIN_VRAM; RADEON_GEM_DOMAIN_VRAM;
p->relocs[i].alt_domain = p->relocs[i].allowed_domains =
RADEON_GEM_DOMAIN_VRAM; RADEON_GEM_DOMAIN_VRAM;
/* prioritize this over any other relocation */ /* prioritize this over any other relocation */
@ -158,10 +158,10 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
return -EINVAL; return -EINVAL;
} }
p->relocs[i].domain = domain; p->relocs[i].prefered_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].alt_domain = domain; p->relocs[i].allowed_domains = domain;
} }
p->relocs[i].tv.bo = &p->relocs[i].robj->tbo; p->relocs[i].tv.bo = &p->relocs[i].robj->tbo;

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

@ -446,7 +446,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) {
bo = lobj->robj; bo = lobj->robj;
if (!bo->pin_count) { if (!bo->pin_count) {
u32 domain = lobj->domain; u32 domain = lobj->prefered_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);
@ -458,7 +458,7 @@ int radeon_bo_list_validate(struct radeon_device *rdev,
* into account. We don't want to disallow buffer moves * into account. We don't want to disallow buffer moves
* completely. * completely.
*/ */
if ((lobj->alt_domain & current_domain) != 0 && if ((lobj->allowed_domains & current_domain) != 0 &&
(domain & current_domain) == 0 && /* will be moved */ (domain & current_domain) == 0 && /* will be moved */
bytes_moved > bytes_moved_threshold) { bytes_moved > bytes_moved_threshold) {
/* don't move it */ /* don't move it */
@ -476,8 +476,9 @@ int radeon_bo_list_validate(struct radeon_device *rdev,
initial_bytes_moved; initial_bytes_moved;
if (unlikely(r)) { if (unlikely(r)) {
if (r != -ERESTARTSYS && domain != lobj->alt_domain) { if (r != -ERESTARTSYS &&
domain = lobj->alt_domain; domain != lobj->allowed_domains) {
domain = lobj->allowed_domains;
goto retry; goto retry;
} }
ttm_eu_backoff_reservation(ticket, head); ttm_eu_backoff_reservation(ticket, head);

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

@ -140,8 +140,8 @@ struct radeon_cs_reloc *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].gobj = NULL; list[0].gobj = NULL;
list[0].robj = vm->page_directory; list[0].robj = vm->page_directory;
list[0].domain = RADEON_GEM_DOMAIN_VRAM; list[0].prefered_domains = RADEON_GEM_DOMAIN_VRAM;
list[0].alt_domain = 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].tiling_flags = 0; list[0].tiling_flags = 0;
list[0].handle = 0; list[0].handle = 0;
@ -153,8 +153,8 @@ struct radeon_cs_reloc *radeon_vm_get_bos(struct radeon_device *rdev,
list[idx].gobj = NULL; list[idx].gobj = NULL;
list[idx].robj = vm->page_tables[i].bo; list[idx].robj = vm->page_tables[i].bo;
list[idx].domain = RADEON_GEM_DOMAIN_VRAM; list[idx].prefered_domains = RADEON_GEM_DOMAIN_VRAM;
list[idx].alt_domain = 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].tiling_flags = 0; list[idx].tiling_flags = 0;
list[idx].handle = 0; list[idx].handle = 0;