diff options
Diffstat (limited to 'drivers/gpu/nvgpu/os')
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/driver_common.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/platform_gk20a.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c | 1 |
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) | |||
215 | platform->unified_memory); | 215 | platform->unified_memory); |
216 | __nvgpu_set_enabled(g, NVGPU_MM_UNIFY_ADDRESS_SPACES, | 216 | __nvgpu_set_enabled(g, NVGPU_MM_UNIFY_ADDRESS_SPACES, |
217 | platform->unify_address_spaces); | 217 | platform->unify_address_spaces); |
218 | __nvgpu_set_enabled(g, NVGPU_MM_FORCE_128K_PMU_VM, | ||
219 | platform->force_128K_pmu_vm); | ||
218 | 220 | ||
219 | nvgpu_mutex_init(&g->mm.tlb_lock); | 221 | nvgpu_mutex_init(&g->mm.tlb_lock); |
220 | nvgpu_mutex_init(&g->mm.priv_lock); | 222 | 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 { | |||
244 | bool honors_aperture; | 244 | bool honors_aperture; |
245 | /* unified or split memory with separate vidmem? */ | 245 | /* unified or split memory with separate vidmem? */ |
246 | bool unified_memory; | 246 | bool unified_memory; |
247 | /* WAR for gm20b chips. */ | ||
248 | bool force_128K_pmu_vm; | ||
247 | 249 | ||
248 | /* | 250 | /* |
249 | * DMA mask for Linux (both coh and non-coh). If not set defaults to | 251 | * 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 = { | |||
952 | 952 | ||
953 | .unified_memory = true, | 953 | .unified_memory = true, |
954 | .dma_mask = DMA_BIT_MASK(34), | 954 | .dma_mask = DMA_BIT_MASK(34), |
955 | .force_128K_pmu_vm = true, | ||
955 | 956 | ||
956 | .secure_buffer_size = 335872, | 957 | .secure_buffer_size = 335872, |
957 | }; | 958 | }; |