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 <kusmab...@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 <tbergst...@nvidia.com> Terje -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
