| Message ID | 1380917913-20482-1-git-send-email-kusmabite@gmail.com |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On 10/04/2013 11:18 PM, Erik Faye-Lund wrote: > The num_relocs count are passed to the kernel per job, not per gather. > > For multi-gather jobs, we would previously fail if there were relocs in > other gathers aside from the first one. > > Fix this by simply moving the check until all gathers have been > consumed. > > Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Reviewed-by: Arto Merilainen <amerilainen@nvidia.com> - Arto -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04.10.2013 23:18, Erik Faye-Lund wrote: > The num_relocs count are passed to the kernel per job, not per gather. > > For multi-gather jobs, we would previously fail if there were relocs in > other gathers aside from the first one. > > Fix this by simply moving the check until all gathers have been > consumed. > > Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> > --- > drivers/gpu/host1x/job.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/host1x/job.c b/drivers/gpu/host1x/job.c > index c4e1050..c9ddff8 100644 > --- a/drivers/gpu/host1x/job.c > +++ b/drivers/gpu/host1x/job.c > @@ -436,10 +436,6 @@ static int validate(struct host1x_firewall *fw, struct host1x_job_gather *g) > } > } > > - /* No relocs should remain at this point */ > - if (fw->num_relocs) > - err = -EINVAL; > - > out: > return err; > } > @@ -493,6 +489,10 @@ static inline int copy_gathers(struct host1x_job *job, struct device *dev) > offset += g->words * sizeof(u32); > } > > + /* No relocs should remain at this point */ > + if (fw.num_relocs) > + return -EINVAL; > + > return 0; > } Good catch. Acked-By: Terje Bergstrom <tbergstrom@nvidia.com> Terje -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Oct 04, 2013 at 08:18:33PM +0000, Erik Faye-Lund wrote: > The num_relocs count are passed to the kernel per job, not per gather. > > For multi-gather jobs, we would previously fail if there were relocs in > other gathers aside from the first one. > > Fix this by simply moving the check until all gathers have been > consumed. > > Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> > --- > drivers/gpu/host1x/job.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Applied, thanks. Thierry
diff --git a/drivers/gpu/host1x/job.c b/drivers/gpu/host1x/job.c index c4e1050..c9ddff8 100644 --- a/drivers/gpu/host1x/job.c +++ b/drivers/gpu/host1x/job.c @@ -436,10 +436,6 @@ static int validate(struct host1x_firewall *fw, struct host1x_job_gather *g) } } - /* No relocs should remain at this point */ - if (fw->num_relocs) - err = -EINVAL; - out: return err; } @@ -493,6 +489,10 @@ static inline int copy_gathers(struct host1x_job *job, struct device *dev) offset += g->words * sizeof(u32); } + /* No relocs should remain at this point */ + if (fw.num_relocs) + return -EINVAL; + return 0; }
The num_relocs count are passed to the kernel per job, not per gather. For multi-gather jobs, we would previously fail if there were relocs in other gathers aside from the first one. Fix this by simply moving the check until all gathers have been consumed. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> --- drivers/gpu/host1x/job.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)