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: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 4a09ffdda00447150133a2b256bd509e11913e7f..17db846808ae126df71532826c62a42fd322169a 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -1051,7 +1051,6 @@ struct radeon_cs_reloc {
        unsigned                        prefered_domains;
        unsigned                        allowed_domains;
        uint32_t                        tiling_flags;
-       uint32_t                        handle;
 };
 
 struct radeon_cs_chunk {

diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index 7846c3e5faf7a63560d8d9c8fcb621ad1ab2d2f6..f1f584ae6c71e40e415ec29cb12b585cca867d21 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -107,14 +107,15 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
                duplicate = false;
                r = (struct drm_radeon_cs_reloc *)&chunk->kdata[i*4];
                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];
                                duplicate = true;
                                break;
                        }
                }
                if (duplicate) {
-                       p->relocs[i].handle = 0;
                        continue;
                }
 
@@ -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.shared = !r->write_domain;
-               p->relocs[i].handle = r->handle;
 
                radeon_cs_buckets_add(&buckets, &p->relocs[i].tv.head,
                                      priority);

diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
index 2b2eb1ce819680978b1aae25ee3abcec62844442..c4ffe026d249138bf37d66ae0d9d755072019d14 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_vm.c
+++ b/drivers/gpu/drm/radeon/radeon_vm.c
@@ -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.shared = true;
        list[0].tiling_flags = 0;
-       list[0].handle = 0;
        list_add(&list[0].tv.head, head);
 
        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,
                list[idx].tv.bo = &list[idx].robj->tbo;
                list[idx].tv.shared = true;
                list[idx].tiling_flags = 0;
-               list[idx].handle = 0;
                list_add(&list[idx++].tv.head, head);
        }