On 17.05.2018 18:34, Thierry Reding wrote:
> From: Thierry Reding <treding@xxxxxxxxxx>
>
> The number of words and the offset in a gather don't need to be
> explicitly sized, so make them unsigned int instead.
>
> Signed-off-by: Thierry Reding <treding@xxxxxxxxxx>
> ---
> drivers/gpu/host1x/job.c | 13 ++++++++-----
> drivers/gpu/host1x/job.h | 4 ++--
> include/linux/host1x.h | 4 ++--
> 3 files changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/host1x/job.c b/drivers/gpu/host1x/job.c
> index 9d6d3e151291..1a8344dbdb2b 100644
> --- a/drivers/gpu/host1x/job.c
> +++ b/drivers/gpu/host1x/job.c
> @@ -96,13 +96,16 @@ void host1x_job_put(struct host1x_job *job)
> EXPORT_SYMBOL(host1x_job_put);
>
> void host1x_job_add_gather(struct host1x_job *job, struct host1x_bo *bo,
> - u32 words, u32 offset)
> + unsigned int words, unsigned int offset)
> {
> - struct host1x_job_gather *cur_gather = &job->gathers[job->num_gathers];
> + struct host1x_job_gather *gather = &job->gathers[job->num_gathers];
> +
> + WARN_ON(job->num_gathers >= job->num_cmdbufs);
> +
> + gather->words = words;
> + gather->bo = bo;
> + gather->offset = offset;
>
> - cur_gather->words = words;
> - cur_gather->bo = bo;
> - cur_gather->offset = offset;
> job->num_gathers++;
> }
> EXPORT_SYMBOL(host1x_job_add_gather);
> diff --git a/drivers/gpu/host1x/job.h b/drivers/gpu/host1x/job.h
> index 4bda51d503ec..188400e00192 100644
> --- a/drivers/gpu/host1x/job.h
> +++ b/drivers/gpu/host1x/job.h
> @@ -20,10 +20,10 @@
> #define __HOST1X_JOB_H
>
> struct host1x_job_gather {
> - u32 words;
> + unsigned int words;
> dma_addr_t base;
> struct host1x_bo *bo;
> - u32 offset;
> + unsigned int offset;
> bool handled;
> };
>
> diff --git a/include/linux/host1x.h b/include/linux/host1x.h
> index dcb6140d39d7..89110d896d72 100644
> --- a/include/linux/host1x.h
> +++ b/include/linux/host1x.h
> @@ -251,8 +251,8 @@ struct host1x_job {
>
> struct host1x_job *host1x_job_alloc(struct host1x_channel *ch,
> u32 num_cmdbufs, u32 num_relocs);
> -void host1x_job_add_gather(struct host1x_job *job, struct host1x_bo *mem_id,
> - u32 words, u32 offset);
> +void host1x_job_add_gather(struct host1x_job *job, struct host1x_bo *bo,
> + unsigned int words, unsigned int offset);
> struct host1x_job *host1x_job_get(struct host1x_job *job);
> void host1x_job_put(struct host1x_job *job);
> int host1x_job_pin(struct host1x_job *job, struct device *dev);
>
Reviewed-by: Dmitry Osipenko <digetx@xxxxxxxxx>
Tested-by: Dmitry Osipenko <digetx@xxxxxxxxx>
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
