diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/cde_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/cde_gk20a.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c index 926e21ef..0db6c21a 100644 --- a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c | |||
@@ -52,7 +52,7 @@ static void gk20a_deinit_cde_img(struct gk20a_cde_ctx *cde_ctx) | |||
52 | unsigned int i; | 52 | unsigned int i; |
53 | 53 | ||
54 | for (i = 0; i < cde_ctx->num_bufs; i++) { | 54 | for (i = 0; i < cde_ctx->num_bufs; i++) { |
55 | struct mem_desc *mem = cde_ctx->mem + i; | 55 | struct nvgpu_mem *mem = cde_ctx->mem + i; |
56 | gk20a_gmmu_unmap_free(cde_ctx->vm, mem); | 56 | gk20a_gmmu_unmap_free(cde_ctx->vm, mem); |
57 | } | 57 | } |
58 | 58 | ||
@@ -226,7 +226,7 @@ static int gk20a_init_cde_buf(struct gk20a_cde_ctx *cde_ctx, | |||
226 | const struct firmware *img, | 226 | const struct firmware *img, |
227 | struct gk20a_cde_hdr_buf *buf) | 227 | struct gk20a_cde_hdr_buf *buf) |
228 | { | 228 | { |
229 | struct mem_desc *mem; | 229 | struct nvgpu_mem *mem; |
230 | int err; | 230 | int err; |
231 | 231 | ||
232 | /* check that the file can hold the buf */ | 232 | /* check that the file can hold the buf */ |
@@ -312,8 +312,8 @@ static int gk20a_init_cde_replace(struct gk20a_cde_ctx *cde_ctx, | |||
312 | const struct firmware *img, | 312 | const struct firmware *img, |
313 | struct gk20a_cde_hdr_replace *replace) | 313 | struct gk20a_cde_hdr_replace *replace) |
314 | { | 314 | { |
315 | struct mem_desc *source_mem; | 315 | struct nvgpu_mem *source_mem; |
316 | struct mem_desc *target_mem; | 316 | struct nvgpu_mem *target_mem; |
317 | u32 *target_mem_ptr; | 317 | u32 *target_mem_ptr; |
318 | u64 vaddr; | 318 | u64 vaddr; |
319 | int err; | 319 | int err; |
@@ -362,7 +362,7 @@ static int gk20a_init_cde_replace(struct gk20a_cde_ctx *cde_ctx, | |||
362 | static int gk20a_cde_patch_params(struct gk20a_cde_ctx *cde_ctx) | 362 | static int gk20a_cde_patch_params(struct gk20a_cde_ctx *cde_ctx) |
363 | { | 363 | { |
364 | struct gk20a *g = cde_ctx->g; | 364 | struct gk20a *g = cde_ctx->g; |
365 | struct mem_desc *target_mem; | 365 | struct nvgpu_mem *target_mem; |
366 | u32 *target_mem_ptr; | 366 | u32 *target_mem_ptr; |
367 | u64 new_data; | 367 | u64 new_data; |
368 | int user_id = 0, err; | 368 | int user_id = 0, err; |
@@ -451,7 +451,7 @@ static int gk20a_init_cde_param(struct gk20a_cde_ctx *cde_ctx, | |||
451 | const struct firmware *img, | 451 | const struct firmware *img, |
452 | struct gk20a_cde_hdr_param *param) | 452 | struct gk20a_cde_hdr_param *param) |
453 | { | 453 | { |
454 | struct mem_desc *target_mem; | 454 | struct nvgpu_mem *target_mem; |
455 | 455 | ||
456 | if (param->target_buf >= cde_ctx->num_bufs) { | 456 | if (param->target_buf >= cde_ctx->num_bufs) { |
457 | gk20a_warn(cde_ctx->dev, "cde: invalid buffer parameter. param idx = %d, target_buf=%u, num_bufs=%u", | 457 | gk20a_warn(cde_ctx->dev, "cde: invalid buffer parameter. param idx = %d, target_buf=%u, num_bufs=%u", |
@@ -545,7 +545,7 @@ static int gk20a_init_cde_command(struct gk20a_cde_ctx *cde_ctx, | |||
545 | 545 | ||
546 | gpfifo_elem = *gpfifo; | 546 | gpfifo_elem = *gpfifo; |
547 | for (i = 0; i < num_elems; i++, cmd_elem++, gpfifo_elem++) { | 547 | for (i = 0; i < num_elems; i++, cmd_elem++, gpfifo_elem++) { |
548 | struct mem_desc *target_mem; | 548 | struct nvgpu_mem *target_mem; |
549 | 549 | ||
550 | /* validate the current entry */ | 550 | /* validate the current entry */ |
551 | if (cmd_elem->target_buf >= cde_ctx->num_bufs) { | 551 | if (cmd_elem->target_buf >= cde_ctx->num_bufs) { |