summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/nvgpu/gk20a/mm_gk20a.c7
-rw-r--r--drivers/gpu/nvgpu/gk20a/mm_gk20a.h8
2 files changed, 2 insertions, 13 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
index 1ab84e03..197e2b81 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
@@ -2559,13 +2559,6 @@ int gk20a_init_vm(struct mm_gk20a *mm,
2559 /* note: keep the page sizes sorted lowest to highest here */ 2559 /* note: keep the page sizes sorted lowest to highest here */
2560 u32 gmmu_page_sizes[gmmu_nr_page_sizes] = { SZ_4K, big_page_size }; 2560 u32 gmmu_page_sizes[gmmu_nr_page_sizes] = { SZ_4K, big_page_size };
2561 2561
2562 /*
2563 * Linsim bug: seems like we can't have pushbuffers above 4GB. Easy WAR for sim
2564 * is to just limit the address space to 4GB.
2565 */
2566 if (tegra_platform_is_linsim() && aperture_size > SZ_4G)
2567 aperture_size = SZ_4G;
2568
2569 vm->mm = mm; 2562 vm->mm = mm;
2570 2563
2571 vm->va_start = low_hole; 2564 vm->va_start = low_hole;
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
index 231f7c9a..1e97e859 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
@@ -352,15 +352,11 @@ static inline int max_vaddr_bits_gk20a(void)
352 352
353/* 353/*
354 * The bottom 16GB of the space are used for small pages, the remaining high 354 * The bottom 16GB of the space are used for small pages, the remaining high
355 * memory is for large pages. On simulation use 2GB for small pages, 2GB for 355 * memory is for large pages.
356 * large pages (if enabled).
357 */ 356 */
358static inline u64 __nv_gmmu_va_small_page_limit(void) 357static inline u64 __nv_gmmu_va_small_page_limit(void)
359{ 358{
360 if (tegra_platform_is_linsim()) 359 return ((u64)SZ_1G * 16);
361 return ((u64)SZ_1G * 2);
362 else
363 return ((u64)SZ_1G * 16);
364} 360}
365 361
366static inline int __nv_gmmu_va_is_upper(struct vm_gk20a *vm, u64 addr) 362static inline int __nv_gmmu_va_is_upper(struct vm_gk20a *vm, u64 addr)