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 4a09ffd..17db846 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 7846c3e..f1f584a 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 --cc drivers/gpu/drm/radeon/radeon_vm.c
Simple merge