diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/gr_gv11b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index 3450bf05..1ba0c523 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <nvgpu/dma.h> | 25 | #include <nvgpu/dma.h> |
26 | #include <nvgpu/log.h> | 26 | #include <nvgpu/log.h> |
27 | #include <nvgpu/debug.h> | 27 | #include <nvgpu/debug.h> |
28 | #include <nvgpu/enabled.h> | ||
28 | 29 | ||
29 | #include "gk20a/gk20a.h" | 30 | #include "gk20a/gk20a.h" |
30 | #include "gk20a/gr_gk20a.h" | 31 | #include "gk20a/gr_gk20a.h" |
@@ -3574,7 +3575,7 @@ static void gr_gv11b_init_gpc_mmu(struct gk20a *g) | |||
3574 | 3575 | ||
3575 | nvgpu_log_info(g, "initialize gpc mmu"); | 3576 | nvgpu_log_info(g, "initialize gpc mmu"); |
3576 | 3577 | ||
3577 | if (!g->ops.privsecurity) { | 3578 | if (!nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) { |
3578 | /* Bypass MMU check for non-secure boot. For | 3579 | /* Bypass MMU check for non-secure boot. For |
3579 | * secure-boot,this register write has no-effect */ | 3580 | * secure-boot,this register write has no-effect */ |
3580 | gk20a_writel(g, fb_priv_mmu_phy_secure_r(), 0xffffffff); | 3581 | gk20a_writel(g, fb_priv_mmu_phy_secure_r(), 0xffffffff); |
@@ -3601,9 +3602,11 @@ static void gr_gv11b_init_gpc_mmu(struct gk20a *g) | |||
3601 | gk20a_readl(g, fb_mmu_debug_rd_r())); | 3602 | gk20a_readl(g, fb_mmu_debug_rd_r())); |
3602 | } | 3603 | } |
3603 | 3604 | ||
3604 | void gv11b_init_gr(struct gpu_ops *gops) | 3605 | void gv11b_init_gr(struct gk20a *g) |
3605 | { | 3606 | { |
3606 | gp10b_init_gr(gops); | 3607 | struct gpu_ops *gops = &g->ops; |
3608 | |||
3609 | gp10b_init_gr(g); | ||
3607 | gops->gr.init_preemption_state = NULL; | 3610 | gops->gr.init_preemption_state = NULL; |
3608 | gops->gr.init_fs_state = gr_gv11b_init_fs_state; | 3611 | gops->gr.init_fs_state = gr_gv11b_init_fs_state; |
3609 | gops->gr.detect_sm_arch = gr_gv11b_detect_sm_arch; | 3612 | gops->gr.detect_sm_arch = gr_gv11b_detect_sm_arch; |