aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2013-10-10 04:21:58 -0400
committerThierry Reding <treding@nvidia.com>2013-10-31 04:20:08 -0400
commitd7fbcf477ac87c6d049fa72f21ee193b2d95f137 (patch)
treeabea1c6aa313def72c2f7324c0009306f248c08d
parent37857cd2c5afa8414dccd7758f0844e7d17c00b7 (diff)
gpu: host1x: firewall: Rename cmdbuf_id -> cmdbuf
The value stored in this field is a pointer to a command buffer, not an ID. Avoid some confusion by reflecting that in the field's name. Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--drivers/gpu/host1x/job.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/host1x/job.c b/drivers/gpu/host1x/job.c
index a7310da0cfaa..bf5100e9b053 100644
--- a/drivers/gpu/host1x/job.c
+++ b/drivers/gpu/host1x/job.c
@@ -281,7 +281,7 @@ struct host1x_firewall {
281 unsigned int num_relocs; 281 unsigned int num_relocs;
282 struct host1x_reloc *reloc; 282 struct host1x_reloc *reloc;
283 283
284 struct host1x_bo *cmdbuf_id; 284 struct host1x_bo *cmdbuf;
285 unsigned int offset; 285 unsigned int offset;
286 286
287 u32 words; 287 u32 words;
@@ -304,7 +304,7 @@ static int check_mask(struct host1x_firewall *fw)
304 if (fw->job->is_addr_reg(fw->dev, fw->class, reg)) { 304 if (fw->job->is_addr_reg(fw->dev, fw->class, reg)) {
305 if (!fw->num_relocs) 305 if (!fw->num_relocs)
306 return -EINVAL; 306 return -EINVAL;
307 if (!check_reloc(fw->reloc, fw->cmdbuf_id, 307 if (!check_reloc(fw->reloc, fw->cmdbuf,
308 fw->offset)) 308 fw->offset))
309 return -EINVAL; 309 return -EINVAL;
310 fw->reloc++; 310 fw->reloc++;
@@ -332,7 +332,7 @@ static int check_incr(struct host1x_firewall *fw)
332 if (fw->job->is_addr_reg(fw->dev, fw->class, reg)) { 332 if (fw->job->is_addr_reg(fw->dev, fw->class, reg)) {
333 if (!fw->num_relocs) 333 if (!fw->num_relocs)
334 return -EINVAL; 334 return -EINVAL;
335 if (!check_reloc(fw->reloc, fw->cmdbuf_id, fw->offset)) 335 if (!check_reloc(fw->reloc, fw->cmdbuf, fw->offset))
336 return -EINVAL; 336 return -EINVAL;
337 fw->reloc++; 337 fw->reloc++;
338 fw->num_relocs--; 338 fw->num_relocs--;
@@ -358,7 +358,7 @@ static int check_nonincr(struct host1x_firewall *fw)
358 if (is_addr_reg) { 358 if (is_addr_reg) {
359 if (!fw->num_relocs) 359 if (!fw->num_relocs)
360 return -EINVAL; 360 return -EINVAL;
361 if (!check_reloc(fw->reloc, fw->cmdbuf_id, fw->offset)) 361 if (!check_reloc(fw->reloc, fw->cmdbuf, fw->offset))
362 return -EINVAL; 362 return -EINVAL;
363 fw->reloc++; 363 fw->reloc++;
364 fw->num_relocs--; 364 fw->num_relocs--;
@@ -381,7 +381,7 @@ static int validate(struct host1x_firewall *fw, struct host1x_job_gather *g)
381 return 0; 381 return 0;
382 382
383 fw->words = g->words; 383 fw->words = g->words;
384 fw->cmdbuf_id = g->bo; 384 fw->cmdbuf = g->bo;
385 fw->offset = 0; 385 fw->offset = 0;
386 386
387 while (fw->words && !err) { 387 while (fw->words && !err) {