diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/cde_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/cde_gk20a.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c index fb368fda..4a3076b5 100644 --- a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c | |||
@@ -79,7 +79,7 @@ __must_hold(&cde_app->mutex) | |||
79 | /* ..then release mapped memory */ | 79 | /* ..then release mapped memory */ |
80 | gk20a_deinit_cde_img(cde_ctx); | 80 | gk20a_deinit_cde_img(cde_ctx); |
81 | gk20a_gmmu_unmap(vm, cde_ctx->backing_store_vaddr, | 81 | gk20a_gmmu_unmap(vm, cde_ctx->backing_store_vaddr, |
82 | g->gr.compbit_store.size, 1); | 82 | g->gr.compbit_store.mem.size, 1); |
83 | 83 | ||
84 | /* housekeeping on app */ | 84 | /* housekeeping on app */ |
85 | list_del(&cde_ctx->list); | 85 | list_del(&cde_ctx->list); |
@@ -392,7 +392,7 @@ static int gk20a_cde_patch_params(struct gk20a_cde_ctx *cde_ctx) | |||
392 | new_data = cde_ctx->compbit_size; | 392 | new_data = cde_ctx->compbit_size; |
393 | break; | 393 | break; |
394 | case TYPE_PARAM_BACKINGSTORE_SIZE: | 394 | case TYPE_PARAM_BACKINGSTORE_SIZE: |
395 | new_data = g->gr.compbit_store.size; | 395 | new_data = g->gr.compbit_store.mem.size; |
396 | break; | 396 | break; |
397 | case TYPE_PARAM_SOURCE_SMMU_ADDR: | 397 | case TYPE_PARAM_SOURCE_SMMU_ADDR: |
398 | new_data = gk20a_mm_gpuva_to_iova_base(cde_ctx->vm, | 398 | new_data = gk20a_mm_gpuva_to_iova_base(cde_ctx->vm, |
@@ -998,7 +998,7 @@ __releases(&cde_app->mutex) | |||
998 | } | 998 | } |
999 | 999 | ||
1000 | gk20a_dbg(gpu_dbg_cde, "cde: buffer=cbc, size=%zu, gpuva=%llx\n", | 1000 | gk20a_dbg(gpu_dbg_cde, "cde: buffer=cbc, size=%zu, gpuva=%llx\n", |
1001 | g->gr.compbit_store.size, cde_ctx->backing_store_vaddr); | 1001 | g->gr.compbit_store.mem.size, cde_ctx->backing_store_vaddr); |
1002 | gk20a_dbg(gpu_dbg_cde, "cde: buffer=compbits, size=%llu, gpuva=%llx\n", | 1002 | gk20a_dbg(gpu_dbg_cde, "cde: buffer=compbits, size=%llu, gpuva=%llx\n", |
1003 | cde_ctx->compbit_size, cde_ctx->compbit_vaddr); | 1003 | cde_ctx->compbit_size, cde_ctx->compbit_vaddr); |
1004 | 1004 | ||
@@ -1122,8 +1122,8 @@ static int gk20a_cde_load(struct gk20a_cde_ctx *cde_ctx) | |||
1122 | } | 1122 | } |
1123 | 1123 | ||
1124 | /* map backing store to gpu virtual space */ | 1124 | /* map backing store to gpu virtual space */ |
1125 | vaddr = gk20a_gmmu_map(ch->vm, &gr->compbit_store.sgt, | 1125 | vaddr = gk20a_gmmu_map(ch->vm, &gr->compbit_store.mem.sgt, |
1126 | g->gr.compbit_store.size, | 1126 | g->gr.compbit_store.mem.size, |
1127 | NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE, | 1127 | NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE, |
1128 | gk20a_mem_flag_read_only); | 1128 | gk20a_mem_flag_read_only); |
1129 | 1129 | ||
@@ -1151,7 +1151,7 @@ static int gk20a_cde_load(struct gk20a_cde_ctx *cde_ctx) | |||
1151 | return 0; | 1151 | return 0; |
1152 | 1152 | ||
1153 | err_init_cde_img: | 1153 | err_init_cde_img: |
1154 | gk20a_gmmu_unmap(ch->vm, vaddr, g->gr.compbit_store.size, 1); | 1154 | gk20a_gmmu_unmap(ch->vm, vaddr, g->gr.compbit_store.mem.size, 1); |
1155 | err_map_backingstore: | 1155 | err_map_backingstore: |
1156 | err_alloc_gpfifo: | 1156 | err_alloc_gpfifo: |
1157 | gk20a_vm_put(ch->vm); | 1157 | gk20a_vm_put(ch->vm); |