Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc003bd4 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

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: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d33a8fc7

drivers/gpu/drm/radeon/radeon.h

+0 −1
Original line number Diff line number Diff line
@@ -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 {

drivers/gpu/drm/radeon/radeon_cs.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/radeon/radeon_vm.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

	}