diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/gr_gp10b.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index ff37d9f3..ce84a93e 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -356,7 +356,7 @@ struct gpu_ops { | |||
356 | struct nvgpu_mem *mem, u64 gpu_va); | 356 | struct nvgpu_mem *mem, u64 gpu_va); |
357 | void (*write_pm_ptr)(struct gk20a *g, | 357 | void (*write_pm_ptr)(struct gk20a *g, |
358 | struct nvgpu_mem *mem, u64 gpu_va); | 358 | struct nvgpu_mem *mem, u64 gpu_va); |
359 | void (*write_preemption_ptr)(struct gk20a *g, | 359 | void (*set_preemption_buffer_va)(struct gk20a *g, |
360 | struct nvgpu_mem *mem, u64 gpu_va); | 360 | struct nvgpu_mem *mem, u64 gpu_va); |
361 | void (*init_elcg_mode)(struct gk20a *g, u32 mode, u32 engine); | 361 | void (*init_elcg_mode)(struct gk20a *g, u32 mode, u32 engine); |
362 | void (*load_tpc_mask)(struct gk20a *g); | 362 | void (*load_tpc_mask)(struct gk20a *g); |
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c index 384ca28d..2356f9f3 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c | |||
@@ -1163,8 +1163,8 @@ static void gr_gp10b_update_ctxsw_preemption_mode(struct gk20a *g, | |||
1163 | u32 size; | 1163 | u32 size; |
1164 | u32 cbes_reserve; | 1164 | u32 cbes_reserve; |
1165 | 1165 | ||
1166 | if (g->ops.gr.write_preemption_ptr) | 1166 | if (g->ops.gr.set_preemption_buffer_va) |
1167 | g->ops.gr.write_preemption_ptr(g, mem, | 1167 | g->ops.gr.set_preemption_buffer_va(g, mem, |
1168 | gr_ctx->t18x.preempt_ctxsw_buffer.gpu_va); | 1168 | gr_ctx->t18x.preempt_ctxsw_buffer.gpu_va); |
1169 | 1169 | ||
1170 | err = gr_gk20a_ctx_patch_write_begin(g, ch_ctx); | 1170 | err = gr_gk20a_ctx_patch_write_begin(g, ch_ctx); |
@@ -2305,7 +2305,7 @@ static int gr_gp10b_init_preemption_state(struct gk20a *g) | |||
2305 | return 0; | 2305 | return 0; |
2306 | } | 2306 | } |
2307 | 2307 | ||
2308 | static void gr_gp10b_write_preemption_ptr(struct gk20a *g, | 2308 | static void gr_gp10b_set_preemption_buffer_va(struct gk20a *g, |
2309 | struct nvgpu_mem *mem, u64 gpu_va) | 2309 | struct nvgpu_mem *mem, u64 gpu_va) |
2310 | { | 2310 | { |
2311 | u32 va = u64_lo32(gpu_va >> 8); | 2311 | u32 va = u64_lo32(gpu_va >> 8); |
@@ -2342,7 +2342,7 @@ void gp10b_init_gr(struct gpu_ops *gops) | |||
2342 | gops->gr.is_valid_compute_class = gr_gp10b_is_valid_compute_class; | 2342 | gops->gr.is_valid_compute_class = gr_gp10b_is_valid_compute_class; |
2343 | gops->gr.commit_global_cb_manager = gr_gp10b_commit_global_cb_manager; | 2343 | gops->gr.commit_global_cb_manager = gr_gp10b_commit_global_cb_manager; |
2344 | gops->gr.commit_global_pagepool = gr_gp10b_commit_global_pagepool; | 2344 | gops->gr.commit_global_pagepool = gr_gp10b_commit_global_pagepool; |
2345 | gops->gr.write_preemption_ptr = gr_gp10b_write_preemption_ptr; | 2345 | gops->gr.set_preemption_buffer_va = gr_gp10b_set_preemption_buffer_va; |
2346 | gops->gr.add_zbc_color = gr_gp10b_add_zbc_color; | 2346 | gops->gr.add_zbc_color = gr_gp10b_add_zbc_color; |
2347 | gops->gr.add_zbc_depth = gr_gp10b_add_zbc_depth; | 2347 | gops->gr.add_zbc_depth = gr_gp10b_add_zbc_depth; |
2348 | gops->gr.pagepool_default_size = gr_gp10b_pagepool_default_size; | 2348 | gops->gr.pagepool_default_size = gr_gp10b_pagepool_default_size; |