diff options
author | mheyer <mheyer@nvidia.com> | 2016-02-20 00:31:24 -0500 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-02-24 11:00:38 -0500 |
commit | de66bf2869b0ad1e29753d088a6c967270624f57 (patch) | |
tree | 95d79eb00edf07b85b80b2d4103a1aa5e9cf8350 /drivers/gpu/nvgpu/gm20b | |
parent | e55a459e2bb410a6dbd084266a652ab1056ca1dd (diff) |
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 <mheyer@nvidia.com>
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
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 <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/gr_gm20b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h | 5 |
2 files changed, 6 insertions, 0 deletions
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) | |||
47 | temp = gk20a_readl(g, fb_mmu_ctrl_r()); | 47 | temp = gk20a_readl(g, fb_mmu_ctrl_r()); |
48 | temp &= gr_gpcs_pri_mmu_ctrl_vm_pg_size_m() | | 48 | temp &= gr_gpcs_pri_mmu_ctrl_vm_pg_size_m() | |
49 | gr_gpcs_pri_mmu_ctrl_use_pdb_big_page_size_m() | | 49 | gr_gpcs_pri_mmu_ctrl_use_pdb_big_page_size_m() | |
50 | gr_gpcs_pri_mmu_ctrl_use_full_comp_tag_line_m() | | ||
50 | gr_gpcs_pri_mmu_ctrl_vol_fault_m() | | 51 | gr_gpcs_pri_mmu_ctrl_vol_fault_m() | |
51 | gr_gpcs_pri_mmu_ctrl_comp_fault_m() | | 52 | gr_gpcs_pri_mmu_ctrl_comp_fault_m() | |
52 | gr_gpcs_pri_mmu_ctrl_miss_gran_m() | | 53 | 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) | |||
3562 | { | 3562 | { |
3563 | return 0x1 << 11; | 3563 | return 0x1 << 11; |
3564 | } | 3564 | } |
3565 | static inline u32 gr_gpcs_pri_mmu_ctrl_use_full_comp_tag_line_m(void) | ||
3566 | { | ||
3567 | return 0x1 << 12; | ||
3568 | } | ||
3569 | |||
3565 | static inline u32 gr_gpcs_pri_mmu_ctrl_vol_fault_m(void) | 3570 | static inline u32 gr_gpcs_pri_mmu_ctrl_vol_fault_m(void) |
3566 | { | 3571 | { |
3567 | return 0x1 << 1; | 3572 | return 0x1 << 1; |