提交 fc003bd4 编写于 作者: C Christian König 提交者: Alex Deucher

drm/radeon: drop the handle from radeon_cs_reloc

It's only used for duplicate check and that
can be done on the original as well.
Signed-off-by: NChristian König <christian.koenig@amd.com>
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
上级 d33a8fc7
...@@ -1051,7 +1051,6 @@ struct radeon_cs_reloc { ...@@ -1051,7 +1051,6 @@ struct radeon_cs_reloc {
unsigned prefered_domains; unsigned prefered_domains;
unsigned allowed_domains; unsigned allowed_domains;
uint32_t tiling_flags; uint32_t tiling_flags;
uint32_t handle;
}; };
struct radeon_cs_chunk { struct radeon_cs_chunk {
......
...@@ -107,14 +107,15 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p) ...@@ -107,14 +107,15 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
duplicate = false; duplicate = false;
r = (struct drm_radeon_cs_reloc *)&chunk->kdata[i*4]; r = (struct drm_radeon_cs_reloc *)&chunk->kdata[i*4];
for (j = 0; j < i; j++) { for (j = 0; j < i; j++) {
if (r->handle == p->relocs[j].handle) { struct drm_radeon_cs_reloc *other;
other = (void *)&chunk->kdata[j*4];
if (r->handle == other->handle) {
p->relocs_ptr[i] = &p->relocs[j]; p->relocs_ptr[i] = &p->relocs[j];
duplicate = true; duplicate = true;
break; break;
} }
} }
if (duplicate) { if (duplicate) {
p->relocs[i].handle = 0;
continue; continue;
} }
...@@ -184,7 +185,6 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p) ...@@ -184,7 +185,6 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
p->relocs[i].tv.bo = &p->relocs[i].robj->tbo; p->relocs[i].tv.bo = &p->relocs[i].robj->tbo;
p->relocs[i].tv.shared = !r->write_domain; p->relocs[i].tv.shared = !r->write_domain;
p->relocs[i].handle = r->handle;
radeon_cs_buckets_add(&buckets, &p->relocs[i].tv.head, radeon_cs_buckets_add(&buckets, &p->relocs[i].tv.head,
priority); priority);
......
...@@ -144,7 +144,6 @@ struct radeon_cs_reloc *radeon_vm_get_bos(struct radeon_device *rdev, ...@@ -144,7 +144,6 @@ struct radeon_cs_reloc *radeon_vm_get_bos(struct radeon_device *rdev,
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;
list[0].tiling_flags = 0; list[0].tiling_flags = 0;
list[0].handle = 0;
list_add(&list[0].tv.head, head); list_add(&list[0].tv.head, head);
for (i = 0, idx = 1; i <= vm->max_pde_used; i++) { for (i = 0, idx = 1; i <= vm->max_pde_used; i++) {
...@@ -157,7 +156,6 @@ struct radeon_cs_reloc *radeon_vm_get_bos(struct radeon_device *rdev, ...@@ -157,7 +156,6 @@ struct radeon_cs_reloc *radeon_vm_get_bos(struct radeon_device *rdev,
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;
list[idx].tiling_flags = 0; list[idx].tiling_flags = 0;
list[idx].handle = 0;
list_add(&list[idx++].tv.head, head); list_add(&list[idx++].tv.head, head);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册