diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/cde_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/cde_gk20a.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c index 6b8af929..57b49f2c 100644 --- a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c | |||
@@ -47,7 +47,7 @@ static struct gk20a_cde_ctx *gk20a_cde_allocate_context(struct gk20a *g); | |||
47 | 47 | ||
48 | static void gk20a_deinit_cde_img(struct gk20a_cde_ctx *cde_ctx) | 48 | static void gk20a_deinit_cde_img(struct gk20a_cde_ctx *cde_ctx) |
49 | { | 49 | { |
50 | int i; | 50 | unsigned int i; |
51 | 51 | ||
52 | for (i = 0; i < cde_ctx->num_bufs; i++) { | 52 | for (i = 0; i < cde_ctx->num_bufs; i++) { |
53 | struct mem_desc *mem = cde_ctx->mem + i; | 53 | struct mem_desc *mem = cde_ctx->mem + i; |
@@ -361,7 +361,8 @@ static int gk20a_cde_patch_params(struct gk20a_cde_ctx *cde_ctx) | |||
361 | struct mem_desc *target_mem; | 361 | struct mem_desc *target_mem; |
362 | u32 *target_mem_ptr; | 362 | u32 *target_mem_ptr; |
363 | u64 new_data; | 363 | u64 new_data; |
364 | int user_id = 0, i, err; | 364 | int user_id = 0, err; |
365 | unsigned int i; | ||
365 | 366 | ||
366 | for (i = 0; i < cde_ctx->num_params; i++) { | 367 | for (i = 0; i < cde_ctx->num_params; i++) { |
367 | struct gk20a_cde_hdr_param *param = cde_ctx->params + i; | 368 | struct gk20a_cde_hdr_param *param = cde_ctx->params + i; |
@@ -456,7 +457,7 @@ static int gk20a_init_cde_param(struct gk20a_cde_ctx *cde_ctx, | |||
456 | } | 457 | } |
457 | 458 | ||
458 | target_mem = cde_ctx->mem + param->target_buf; | 459 | target_mem = cde_ctx->mem + param->target_buf; |
459 | if (target_mem->size< (param->target_byte_offset + 3)) { | 460 | if (target_mem->size < (param->target_byte_offset + 3)) { |
460 | gk20a_warn(cde_ctx->dev, "cde: invalid buffer parameter. param idx = %d, target_buf_offs=%lld, target_buf_size=%zu", | 461 | gk20a_warn(cde_ctx->dev, "cde: invalid buffer parameter. param idx = %d, target_buf_offs=%lld, target_buf_size=%zu", |
461 | cde_ctx->num_params, param->target_byte_offset, | 462 | cde_ctx->num_params, param->target_byte_offset, |
462 | target_mem->size); | 463 | target_mem->size); |
@@ -515,7 +516,7 @@ static int gk20a_init_cde_command(struct gk20a_cde_ctx *cde_ctx, | |||
515 | { | 516 | { |
516 | struct nvgpu_gpfifo **gpfifo, *gpfifo_elem; | 517 | struct nvgpu_gpfifo **gpfifo, *gpfifo_elem; |
517 | u32 *num_entries; | 518 | u32 *num_entries; |
518 | int i; | 519 | unsigned int i; |
519 | 520 | ||
520 | /* check command type */ | 521 | /* check command type */ |
521 | if (op == TYPE_BUF_COMMAND_INIT) { | 522 | if (op == TYPE_BUF_COMMAND_INIT) { |
@@ -615,7 +616,7 @@ static int gk20a_init_cde_img(struct gk20a_cde_ctx *cde_ctx, | |||
615 | struct gk20a_cde_hdr_elem *elem; | 616 | struct gk20a_cde_hdr_elem *elem; |
616 | u32 min_size = 0; | 617 | u32 min_size = 0; |
617 | int err = 0; | 618 | int err = 0; |
618 | int i; | 619 | unsigned int i; |
619 | 620 | ||
620 | min_size += 2 * sizeof(u32); | 621 | min_size += 2 * sizeof(u32); |
621 | if (img->size < min_size) { | 622 | if (img->size < min_size) { |