diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gv100/fb_gv100.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/gpu/nvgpu/gv100/fb_gv100.c b/drivers/gpu/nvgpu/gv100/fb_gv100.c index 84a8d64a..defb6642 100644 --- a/drivers/gpu/nvgpu/gv100/fb_gv100.c +++ b/drivers/gpu/nvgpu/gv100/fb_gv100.c | |||
@@ -83,18 +83,12 @@ int gv100_fb_memory_unlock(struct gk20a *g) | |||
83 | 83 | ||
84 | nvgpu_log_fn(g, " "); | 84 | nvgpu_log_fn(g, " "); |
85 | 85 | ||
86 | /* Check vpr enable status */ | 86 | nvgpu_log_info(g, "fb_mmu_vpr_info = 0x%08x", |
87 | val = gk20a_readl(g, fb_mmu_vpr_info_r()); | 87 | gk20a_readl(g, fb_mmu_vpr_info_r())); |
88 | val &= ~fb_mmu_vpr_info_index_m(); | 88 | /* |
89 | val |= fb_mmu_vpr_info_index_cya_lo_v(); | 89 | * mem_unlock.bin should be written to install |
90 | gk20a_writel(g, fb_mmu_vpr_info_r(), val); | 90 | * traps even if VPR isn’t actually supported |
91 | val = gk20a_readl(g, fb_mmu_vpr_info_r()); | 91 | */ |
92 | if (!(val & fb_mmu_vpr_info_cya_lo_in_use_m())) { | ||
93 | nvgpu_log_info(g, "mem unlock not required on this SKU, skipping"); | ||
94 | goto exit; | ||
95 | } | ||
96 | |||
97 | /* get mem unlock ucode binary */ | ||
98 | mem_unlock_fw = nvgpu_request_firmware(g, "mem_unlock.bin", 0); | 92 | mem_unlock_fw = nvgpu_request_firmware(g, "mem_unlock.bin", 0); |
99 | if (!mem_unlock_fw) { | 93 | if (!mem_unlock_fw) { |
100 | nvgpu_err(g, "mem unlock ucode get fail"); | 94 | nvgpu_err(g, "mem unlock ucode get fail"); |