From de66bf2869b0ad1e29753d088a6c967270624f57 Mon Sep 17 00:00:00 2001 From: mheyer Date: Fri, 19 Feb 2016 21:31:24 -0800 Subject: gpu: nvgpu: enable use_full_comp_tag_line in gpc mmu Also GPC MMU needs to have its PRI_MMU_CTRL_USE_FULL_COMP_TAG_LINE control bit set. Bug 1730611 Signed-off-by: Mathias Heyer Signed-off-by: Konsta Holtta Change-Id: I01e11de066ea5487bf1d9c8c8eddbf159e4882da Reviewed-on: http://git-master/r/1014881 (cherry picked from commit d1651bbebe1b3e46d2173dec1651b3d2f4307b40) Reviewed-on: http://git-master/r/1017459 Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom --- drivers/gpu/nvgpu/gm20b/gr_gm20b.c | 1 + drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c index ab1b166d..2a891647 100644 --- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c @@ -47,6 +47,7 @@ static void gr_gm20b_init_gpc_mmu(struct gk20a *g) temp = gk20a_readl(g, fb_mmu_ctrl_r()); temp &= gr_gpcs_pri_mmu_ctrl_vm_pg_size_m() | gr_gpcs_pri_mmu_ctrl_use_pdb_big_page_size_m() | + gr_gpcs_pri_mmu_ctrl_use_full_comp_tag_line_m() | gr_gpcs_pri_mmu_ctrl_vol_fault_m() | gr_gpcs_pri_mmu_ctrl_comp_fault_m() | gr_gpcs_pri_mmu_ctrl_miss_gran_m() | diff --git a/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h index 696f518c..6357b372 100644 --- a/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h @@ -3562,6 +3562,11 @@ static inline u32 gr_gpcs_pri_mmu_ctrl_use_pdb_big_page_size_m(void) { return 0x1 << 11; } +static inline u32 gr_gpcs_pri_mmu_ctrl_use_full_comp_tag_line_m(void) +{ + return 0x1 << 12; +} + static inline u32 gr_gpcs_pri_mmu_ctrl_vol_fault_m(void) { return 0x1 << 1; -- cgit v1.2.2