summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2017-10-25 04:42:03 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-10-25 11:36:35 -0400
commitc79112f3b1e2a428603e06486bd3cea83942c14e (patch)
tree567d76d0455415a1437561d9aa75abcbf9d8ad90 /drivers/gpu/nvgpu/gk20a
parent41496b359d858e1c28840eaee2e2e6bba485c642 (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/gk20a')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.h1
-rw-r--r--drivers/gpu/nvgpu/gk20a/gr_gk20a.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 9c09e85f..4f3b34b8 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -414,6 +414,7 @@ struct gpu_ops {
414 u32 (*tpc_enabled_exceptions)(struct gk20a *g); 414 u32 (*tpc_enabled_exceptions)(struct gk20a *g);
415 int (*set_czf_bypass)(struct gk20a *g, 415 int (*set_czf_bypass)(struct gk20a *g,
416 struct channel_gk20a *ch); 416 struct channel_gk20a *ch);
417 void (*init_czf_bypass)(struct gk20a *g);
417 bool (*sm_debugger_attached)(struct gk20a *g); 418 bool (*sm_debugger_attached)(struct gk20a *g);
418 void (*suspend_single_sm)(struct gk20a *g, 419 void (*suspend_single_sm)(struct gk20a *g,
419 u32 gpc, u32 tpc, u32 sm, 420 u32 gpc, u32 tpc, u32 sm,
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 6d370250..5910c7d9 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -4838,6 +4838,9 @@ static int gk20a_init_gr_setup_sw(struct gk20a *g)
4838 4838
4839 gr_gk20a_load_zbc_default_table(g, gr); 4839 gr_gk20a_load_zbc_default_table(g, gr);
4840 4840
4841 if (g->ops.gr.init_czf_bypass)
4842 g->ops.gr.init_czf_bypass(g);
4843
4841 nvgpu_mutex_init(&gr->ctx_mutex); 4844 nvgpu_mutex_init(&gr->ctx_mutex);
4842 nvgpu_spinlock_init(&gr->ch_tlb_lock); 4845 nvgpu_spinlock_init(&gr->ch_tlb_lock);
4843 4846