summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorseshendra Gadagottu <sgadagottu@nvidia.com>2017-10-18 14:40:46 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-10-20 13:05:40 -0400
commit387ecf8a6360f463a129ab569aaef921fe0a2b0e (patch)
tree23aecdd91d5e305dc4d184db9ca60a1d14360538 /drivers
parent98b08b413bb5ef082719bf2907629ab00137ec81 (diff)
gpu: nvgpu: gv1xx: Remove HAL for restore_context_header
gr restore_context_header is not required any more after enabling per context va mode for subcontext. Cleaning-up unused function pointers from gv100 and gv11b HAL. Change-Id: I65cc7d12d3c96726d323defd99726c3e259e7e63 Signed-off-by: seshendra Gadagottu <sgadagottu@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1581432 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/nvgpu/gv100/hal_gv100.c1
-rw-r--r--drivers/gpu/nvgpu/gv11b/gr_gv11b.c18
-rw-r--r--drivers/gpu/nvgpu/gv11b/gr_gv11b.h2
-rw-r--r--drivers/gpu/nvgpu/gv11b/hal_gv11b.c1
-rw-r--r--drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c1
5 files changed, 0 insertions, 23 deletions
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c
index 9d033d6d..f20d2dcf 100644
--- a/drivers/gpu/nvgpu/gv100/hal_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c
@@ -387,7 +387,6 @@ static const struct gpu_ops gv100_ops = {
387 .handle_tpc_mpc_exception = gr_gv11b_handle_tpc_mpc_exception, 387 .handle_tpc_mpc_exception = gr_gv11b_handle_tpc_mpc_exception,
388 .zbc_s_query_table = gr_gv11b_zbc_s_query_table, 388 .zbc_s_query_table = gr_gv11b_zbc_s_query_table,
389 .load_zbc_s_default_tbl = gr_gv11b_load_stencil_default_tbl, 389 .load_zbc_s_default_tbl = gr_gv11b_load_stencil_default_tbl,
390 .restore_context_header = gv11b_restore_context_header,
391 .handle_gpc_gpcmmu_exception = 390 .handle_gpc_gpcmmu_exception =
392 gr_gv11b_handle_gpc_gpcmmu_exception, 391 gr_gv11b_handle_gpc_gpcmmu_exception,
393 .add_zbc_type_s = gr_gv11b_add_zbc_type_s, 392 .add_zbc_type_s = gr_gv11b_add_zbc_type_s,
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
index aac6cba3..154088d6 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
@@ -2306,24 +2306,6 @@ int gr_gv11b_commit_global_timeslice(struct gk20a *g,
2306 return 0; 2306 return 0;
2307} 2307}
2308 2308
2309void gv11b_restore_context_header(struct gk20a *g,
2310 struct nvgpu_mem *ctxheader)
2311{
2312 u32 va_lo, va_hi;
2313 struct gr_gk20a *gr = &g->gr;
2314
2315 va_hi = nvgpu_mem_rd(g, ctxheader,
2316 ctxsw_prog_main_image_context_buffer_ptr_hi_o());
2317 va_lo = nvgpu_mem_rd(g, ctxheader,
2318 ctxsw_prog_main_image_context_buffer_ptr_o());
2319 nvgpu_mem_wr_n(g, ctxheader, 0,
2320 gr->ctx_vars.local_golden_image,
2321 gr->ctx_vars.golden_image_size);
2322 nvgpu_mem_wr(g, ctxheader,
2323 ctxsw_prog_main_image_context_buffer_ptr_hi_o(), va_hi);
2324 nvgpu_mem_wr(g, ctxheader,
2325 ctxsw_prog_main_image_context_buffer_ptr_o(), va_lo);
2326}
2327void gr_gv11b_write_zcull_ptr(struct gk20a *g, 2309void gr_gv11b_write_zcull_ptr(struct gk20a *g,
2328 struct nvgpu_mem *mem, u64 gpu_va) 2310 struct nvgpu_mem *mem, u64 gpu_va)
2329{ 2311{
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.h b/drivers/gpu/nvgpu/gv11b/gr_gv11b.h
index dbaee5a7..ed469abd 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.h
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.h
@@ -145,8 +145,6 @@ int gr_gv11b_load_smid_config(struct gk20a *g);
145int gr_gv11b_commit_inst(struct channel_gk20a *c, u64 gpu_va); 145int gr_gv11b_commit_inst(struct channel_gk20a *c, u64 gpu_va);
146int gr_gv11b_commit_global_timeslice(struct gk20a *g, 146int gr_gv11b_commit_global_timeslice(struct gk20a *g,
147 struct channel_gk20a *c, bool patch); 147 struct channel_gk20a *c, bool patch);
148void gv11b_restore_context_header(struct gk20a *g,
149 struct nvgpu_mem *ctxheader);
150void gr_gv11b_write_zcull_ptr(struct gk20a *g, 148void gr_gv11b_write_zcull_ptr(struct gk20a *g,
151 struct nvgpu_mem *mem, u64 gpu_va); 149 struct nvgpu_mem *mem, u64 gpu_va);
152void gr_gv11b_write_pm_ptr(struct gk20a *g, 150void gr_gv11b_write_pm_ptr(struct gk20a *g,
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index 328398d9..168def5c 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -349,7 +349,6 @@ static const struct gpu_ops gv11b_ops = {
349 .handle_tpc_mpc_exception = gr_gv11b_handle_tpc_mpc_exception, 349 .handle_tpc_mpc_exception = gr_gv11b_handle_tpc_mpc_exception,
350 .zbc_s_query_table = gr_gv11b_zbc_s_query_table, 350 .zbc_s_query_table = gr_gv11b_zbc_s_query_table,
351 .load_zbc_s_default_tbl = gr_gv11b_load_stencil_default_tbl, 351 .load_zbc_s_default_tbl = gr_gv11b_load_stencil_default_tbl,
352 .restore_context_header = gv11b_restore_context_header,
353 .handle_gpc_gpcmmu_exception = 352 .handle_gpc_gpcmmu_exception =
354 gr_gv11b_handle_gpc_gpcmmu_exception, 353 gr_gv11b_handle_gpc_gpcmmu_exception,
355 .add_zbc_type_s = gr_gv11b_add_zbc_type_s, 354 .add_zbc_type_s = gr_gv11b_add_zbc_type_s,
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
index 80ed59a2..9226206a 100644
--- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
+++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
@@ -232,7 +232,6 @@ static const struct gpu_ops vgpu_gv11b_ops = {
232 .handle_tpc_mpc_exception = gr_gv11b_handle_tpc_mpc_exception, 232 .handle_tpc_mpc_exception = gr_gv11b_handle_tpc_mpc_exception,
233 .zbc_s_query_table = gr_gv11b_zbc_s_query_table, 233 .zbc_s_query_table = gr_gv11b_zbc_s_query_table,
234 .load_zbc_s_default_tbl = gr_gv11b_load_stencil_default_tbl, 234 .load_zbc_s_default_tbl = gr_gv11b_load_stencil_default_tbl,
235 .restore_context_header = gv11b_restore_context_header,
236 .handle_gpc_gpcmmu_exception = 235 .handle_gpc_gpcmmu_exception =
237 gr_gv11b_handle_gpc_gpcmmu_exception, 236 gr_gv11b_handle_gpc_gpcmmu_exception,
238 .add_zbc_type_s = gr_gv11b_add_zbc_type_s, 237 .add_zbc_type_s = gr_gv11b_add_zbc_type_s,