summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2015-06-04 19:00:52 -0400
committerTerje Bergstrom <tbergstrom@nvidia.com>2015-06-11 13:16:47 -0400
commit099af7667486b3b21c42bd5ed8543e70cabc6f92 (patch)
tree0b892c8b6829ba842faa8613b468472e515b757a /drivers/gpu/nvgpu/gk20a/mm_gk20a.h
parent00721d4cb879c1d0a7b80375be2f7ce7c4e4a6d8 (diff)
gpu: nvgpu: Remove simulation WAR
The WAR put into simulation to avoid a simulator crash can now be removed (c85be1a0968de813fe9b99ebd5c261dcb0ca8875). The first issue with the failing test was found to be GPFIFO entries that were not invalid. Other issues are still present with the test and are fixed in a later commit. Change-Id: I7d3def2e384eede82cfc82b961f09ca23b239d30 Signed-off-by: Alex Waterman <alexw@nvidia.com> Reviewed-on: http://git-master/r/753378 Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Tested-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/755815 Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/mm_gk20a.h')
-rw-r--r--drivers/gpu/nvgpu/gk20a/mm_gk20a.h8
1 files changed, 2 insertions, 6 deletions
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)