gpu: nvgpu: gv100: load mem_unlock

mem unlock bin should be written to install
traps even if VPR isn’t actually supported

Bug 2093809

Change-Id: I4024c66ff72a079c3f20f3b8ab356fba7ce05d4e
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1709765
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Seema Khowala
2018-05-07 10:54:01 -07:00
committed by mobile promotions
parent c4c44cfb10
commit 4ff87c7d35

View File

@@ -83,18 +83,12 @@ int gv100_fb_memory_unlock(struct gk20a *g)
nvgpu_log_fn(g, " ");
/* Check vpr enable status */
val = gk20a_readl(g, fb_mmu_vpr_info_r());
val &= ~fb_mmu_vpr_info_index_m();
val |= fb_mmu_vpr_info_index_cya_lo_v();
gk20a_writel(g, fb_mmu_vpr_info_r(), val);
val = gk20a_readl(g, fb_mmu_vpr_info_r());
if (!(val & fb_mmu_vpr_info_cya_lo_in_use_m())) {
nvgpu_log_info(g, "mem unlock not required on this SKU, skipping");
goto exit;
}
/* get mem unlock ucode binary */
nvgpu_log_info(g, "fb_mmu_vpr_info = 0x%08x",
gk20a_readl(g, fb_mmu_vpr_info_r()));
/*
* mem_unlock.bin should be written to install
* traps even if VPR isnt actually supported
*/
mem_unlock_fw = nvgpu_request_firmware(g, "mem_unlock.bin", 0);
if (!mem_unlock_fw) {
nvgpu_err(g, "mem unlock ucode get fail");