Commit d7fbcf47 authored by Thierry Reding's avatar Thierry Reding

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: default avatarThierry Reding <treding@nvidia.com>
parent 37857cd2
...@@ -281,7 +281,7 @@ struct host1x_firewall { ...@@ -281,7 +281,7 @@ struct host1x_firewall {
unsigned int num_relocs; unsigned int num_relocs;
struct host1x_reloc *reloc; struct host1x_reloc *reloc;
struct host1x_bo *cmdbuf_id; struct host1x_bo *cmdbuf;
unsigned int offset; unsigned int offset;
u32 words; u32 words;
...@@ -304,7 +304,7 @@ static int check_mask(struct host1x_firewall *fw) ...@@ -304,7 +304,7 @@ static int check_mask(struct host1x_firewall *fw)
if (fw->job->is_addr_reg(fw->dev, fw->class, reg)) { if (fw->job->is_addr_reg(fw->dev, fw->class, reg)) {
if (!fw->num_relocs) if (!fw->num_relocs)
return -EINVAL; return -EINVAL;
if (!check_reloc(fw->reloc, fw->cmdbuf_id, if (!check_reloc(fw->reloc, fw->cmdbuf,
fw->offset)) fw->offset))
return -EINVAL; return -EINVAL;
fw->reloc++; fw->reloc++;
...@@ -332,7 +332,7 @@ static int check_incr(struct host1x_firewall *fw) ...@@ -332,7 +332,7 @@ static int check_incr(struct host1x_firewall *fw)
if (fw->job->is_addr_reg(fw->dev, fw->class, reg)) { if (fw->job->is_addr_reg(fw->dev, fw->class, reg)) {
if (!fw->num_relocs) if (!fw->num_relocs)
return -EINVAL; return -EINVAL;
if (!check_reloc(fw->reloc, fw->cmdbuf_id, fw->offset)) if (!check_reloc(fw->reloc, fw->cmdbuf, fw->offset))
return -EINVAL; return -EINVAL;
fw->reloc++; fw->reloc++;
fw->num_relocs--; fw->num_relocs--;
...@@ -358,7 +358,7 @@ static int check_nonincr(struct host1x_firewall *fw) ...@@ -358,7 +358,7 @@ static int check_nonincr(struct host1x_firewall *fw)
if (is_addr_reg) { if (is_addr_reg) {
if (!fw->num_relocs) if (!fw->num_relocs)
return -EINVAL; return -EINVAL;
if (!check_reloc(fw->reloc, fw->cmdbuf_id, fw->offset)) if (!check_reloc(fw->reloc, fw->cmdbuf, fw->offset))
return -EINVAL; return -EINVAL;
fw->reloc++; fw->reloc++;
fw->num_relocs--; fw->num_relocs--;
...@@ -381,7 +381,7 @@ static int validate(struct host1x_firewall *fw, struct host1x_job_gather *g) ...@@ -381,7 +381,7 @@ static int validate(struct host1x_firewall *fw, struct host1x_job_gather *g)
return 0; return 0;
fw->words = g->words; fw->words = g->words;
fw->cmdbuf_id = g->bo; fw->cmdbuf = g->bo;
fw->offset = 0; fw->offset = 0;
while (fw->words && !err) { while (fw->words && !err) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment