3 files changed, 5 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/os/linux/driver_common.c b/drivers/gpu/nvgpu/os/linux/driver_common.c
index c651e394..f1eccd06 100644
--- a/drivers/gpu/nvgpu/os/linux/driver_common.c
+++ b/drivers/gpu/nvgpu/os/linux/driver_common.c
@@ -215,6 +215,8 @@ static void nvgpu_init_mm_vars(struct gk20a *g)
                             platform->unified_memory);
         __nvgpu_set_enabled(g, NVGPU_MM_UNIFY_ADDRESS_SPACES,
                             platform->unify_address_spaces);
+        __nvgpu_set_enabled(g, NVGPU_MM_FORCE_128K_PMU_VM,
+                            platform->force_128K_pmu_vm);
 
         nvgpu_mutex_init(&g->mm.tlb_lock);
         nvgpu_mutex_init(&g->mm.priv_lock);
diff --git a/drivers/gpu/nvgpu/os/linux/platform_gk20a.h b/drivers/gpu/nvgpu/os/linux/platform_gk20a.h
index a4c3eca3..f3e80b8c 100644
--- a/drivers/gpu/nvgpu/os/linux/platform_gk20a.h
+++ b/drivers/gpu/nvgpu/os/linux/platform_gk20a.h
@@ -244,6 +244,8 @@ struct gk20a_platform {
         bool honors_aperture;
         /* unified or split memory with separate vidmem? */
         bool unified_memory;
+        /* WAR for gm20b chips. */
+        bool force_128K_pmu_vm;
 
         /*
          * DMA mask for Linux (both coh and non-coh). If not set defaults to
diff --git a/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c
index 432af108..033563dc 100644
--- a/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c
@@ -952,6 +952,7 @@ struct gk20a_platform gm20b_tegra_platform = {
 
         .unified_memory = true,
         .dma_mask = DMA_BIT_MASK(34),
+        .force_128K_pmu_vm = true,
 
         .secure_buffer_size = 335872,
 };