diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2017-10-25 04:42:03 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-10-25 11:36:35 -0400 |
commit | c79112f3b1e2a428603e06486bd3cea83942c14e (patch) | |
tree | 567d76d0455415a1437561d9aa75abcbf9d8ad90 /drivers/gpu/nvgpu/gp10b | |
parent | 41496b359d858e1c28840eaee2e2e6bba485c642 (diff) |
gpu: nvgpu: initialize czf_bypass only once
We right now initialize czf_bypass value in gr_gp10b_init_preemption_state()
which is run at every rail ungate
And that results in any user specified value through sysfs getting lost after
railgate
To fix this, move initialization of czf_bypass to gk20a_init_gr_setup_sw() so
that it gets initialized only once
Add new HAL g->ops.gr.init_czf_bypass to initialize same and define it for
gp10b/gp106/vgpu-gp10b
Bug 2008262
Change-Id: I80a38ef527c86e32c6d64d0626b867239db9ea51
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1585224
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/gr_gp10b.c | 7 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/gr_gp10b.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c index 060cc9fb..813b8891 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c | |||
@@ -2361,8 +2361,6 @@ int gr_gp10b_init_preemption_state(struct gk20a *g) | |||
2361 | gr_debug_2_gfxp_wfi_always_injects_wfi_enabled_f()); | 2361 | gr_debug_2_gfxp_wfi_always_injects_wfi_enabled_f()); |
2362 | gk20a_writel(g, gr_debug_2_r(), debug_2); | 2362 | gk20a_writel(g, gr_debug_2_r(), debug_2); |
2363 | 2363 | ||
2364 | g->gr.czf_bypass = gr_gpc0_prop_debug1_czf_bypass_init_v(); | ||
2365 | |||
2366 | return 0; | 2364 | return 0; |
2367 | } | 2365 | } |
2368 | 2366 | ||
@@ -2376,6 +2374,11 @@ void gr_gp10b_set_preemption_buffer_va(struct gk20a *g, | |||
2376 | 2374 | ||
2377 | } | 2375 | } |
2378 | 2376 | ||
2377 | void gr_gp10b_init_czf_bypass(struct gk20a *g) | ||
2378 | { | ||
2379 | g->gr.czf_bypass = gr_gpc0_prop_debug1_czf_bypass_init_v(); | ||
2380 | } | ||
2381 | |||
2379 | int gr_gp10b_set_czf_bypass(struct gk20a *g, struct channel_gk20a *ch) | 2382 | int gr_gp10b_set_czf_bypass(struct gk20a *g, struct channel_gk20a *ch) |
2380 | { | 2383 | { |
2381 | struct nvgpu_dbg_gpu_reg_op ops; | 2384 | struct nvgpu_dbg_gpu_reg_op ops; |
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.h b/drivers/gpu/nvgpu/gp10b/gr_gp10b.h index 6ae4789a..9ddc0375 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.h | |||
@@ -143,6 +143,7 @@ int gr_gp10b_init_preemption_state(struct gk20a *g); | |||
143 | void gr_gp10b_set_preemption_buffer_va(struct gk20a *g, | 143 | void gr_gp10b_set_preemption_buffer_va(struct gk20a *g, |
144 | struct nvgpu_mem *mem, u64 gpu_va); | 144 | struct nvgpu_mem *mem, u64 gpu_va); |
145 | int gr_gp10b_set_czf_bypass(struct gk20a *g, struct channel_gk20a *ch); | 145 | int gr_gp10b_set_czf_bypass(struct gk20a *g, struct channel_gk20a *ch); |
146 | void gr_gp10b_init_czf_bypass(struct gk20a *g); | ||
146 | void gr_gp10b_init_ctxsw_hdr_data(struct gk20a *g, struct nvgpu_mem *mem); | 147 | void gr_gp10b_init_ctxsw_hdr_data(struct gk20a *g, struct nvgpu_mem *mem); |
147 | 148 | ||
148 | struct gr_t18x { | 149 | struct gr_t18x { |
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index a10df740..98e143f0 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -303,6 +303,7 @@ static const struct gpu_ops gp10b_ops = { | |||
303 | .set_boosted_ctx = gr_gp10b_set_boosted_ctx, | 303 | .set_boosted_ctx = gr_gp10b_set_boosted_ctx, |
304 | .set_preemption_mode = gr_gp10b_set_preemption_mode, | 304 | .set_preemption_mode = gr_gp10b_set_preemption_mode, |
305 | .set_czf_bypass = gr_gp10b_set_czf_bypass, | 305 | .set_czf_bypass = gr_gp10b_set_czf_bypass, |
306 | .init_czf_bypass = gr_gp10b_init_czf_bypass, | ||
306 | .pre_process_sm_exception = gr_gp10b_pre_process_sm_exception, | 307 | .pre_process_sm_exception = gr_gp10b_pre_process_sm_exception, |
307 | .set_preemption_buffer_va = gr_gp10b_set_preemption_buffer_va, | 308 | .set_preemption_buffer_va = gr_gp10b_set_preemption_buffer_va, |
308 | .init_preemption_state = gr_gp10b_init_preemption_state, | 309 | .init_preemption_state = gr_gp10b_init_preemption_state, |