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

Commit 06490bb9 authored by Thierry Reding's avatar Thierry Reding
Browse files

gpu: host1x: Rename relocarray -> relocs for consistency 



All other array variables use a plural, and this is the only one using
the *array suffix. This is confusing, so rename it for consistency.

Reviewed-by: default avatarDmitry Osipenko <digetx@gmail.com>
Tested-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent ac330f45

drivers/gpu/drm/tegra/drm.c

+2 −2
Original line number Diff line number Diff line
@@ -426,13 +426,13 @@ int tegra_drm_submit(struct tegra_drm_context *context, 
		struct host1x_reloc *reloc;

		struct tegra_bo *obj;



		err = host1x_reloc_copy_from_user(&job->relocarray[num_relocs],

		err = host1x_reloc_copy_from_user(&job->relocs[num_relocs],

						  &user_relocs[num_relocs], drm,

						  file);

		if (err < 0)

			goto fail;



		reloc = &job->relocarray[num_relocs];

		reloc = &job->relocs[num_relocs];

		obj = host1x_to_tegra_bo(reloc->cmdbuf.bo);

		refs[num_refs++] = &obj->gem;

drivers/gpu/host1x/job.c

+4 −4
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ struct host1x_job *host1x_job_alloc(struct host1x_channel *ch, 


	/* Redistribute memory to the structs  */

	mem += sizeof(struct host1x_job);

	job->relocarray = num_relocs ? mem : NULL;

	job->relocs = num_relocs ? mem : NULL;

	mem += num_relocs * sizeof(struct host1x_reloc);

	job->unpins = num_unpins ? mem : NULL;

	mem += num_unpins * sizeof(struct host1x_job_unpin_data);
@@ -115,7 +115,7 @@ static unsigned int pin_job(struct host1x *host, struct host1x_job *job) 
	job->num_unpins = 0;



	for (i = 0; i < job->num_relocs; i++) {

		struct host1x_reloc *reloc = &job->relocarray[i];

		struct host1x_reloc *reloc = &job->relocs[i];

		struct sg_table *sgt;

		dma_addr_t phys_addr;
@@ -203,7 +203,7 @@ static int do_relocs(struct host1x_job *job, struct host1x_job_gather *g) 


	/* pin & patch the relocs for one gather */

	for (i = 0; i < job->num_relocs; i++) {

		struct host1x_reloc *reloc = &job->relocarray[i];

		struct host1x_reloc *reloc = &job->relocs[i];

		u32 reloc_addr = (job->reloc_addr_phys[i] +

				  reloc->target.offset) >> reloc->shift;

		u32 *target;
@@ -455,7 +455,7 @@ static inline int copy_gathers(struct host1x_job *job, struct device *dev) 


	fw.job = job;

	fw.dev = dev;

	fw.reloc = job->relocarray;

	fw.reloc = job->relocs;

	fw.num_relocs = job->num_relocs;

	fw.class = job->class;

include/linux/host1x.h

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ struct host1x_job { 
	unsigned int num_gathers;



	/* Array of handles to be pinned & unpinned */

	struct host1x_reloc *relocarray;

	struct host1x_reloc *relocs;

	unsigned int num_relocs;

	struct host1x_job_unpin_data *unpins;

	unsigned int num_unpins;