From 4ff87c7d35f34e01e138cbedb143a37ff32a8926 Mon Sep 17 00:00:00 2001 From: Seema Khowala Date: Mon, 7 May 2018 10:54:01 -0700 Subject: gpu: nvgpu: gv100: load mem_unlock MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://git-master.nvidia.com/r/1709765 Reviewed-by: svc-mobile-coverity Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gv100/fb_gv100.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'drivers') 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) 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 isn’t 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"); -- cgit v1.2.2