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

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,
         /* note: keep the page sizes sorted lowest to highest here */
         u32 gmmu_page_sizes[gmmu_nr_page_sizes] = { SZ_4K, big_page_size };
 
-        /*
-         * Linsim bug: seems like we can't have pushbuffers above 4GB. Easy WAR for sim
-         * is to just limit the address space to 4GB.
-         */
-        if (tegra_platform_is_linsim() && aperture_size > SZ_4G)
-                aperture_size = SZ_4G;
-
         vm->mm = mm;
 
         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)
 
 /*
  * The bottom 16GB of the space are used for small pages, the remaining high
- * memory is for large pages. On simulation use 2GB for small pages, 2GB for
- * large pages (if enabled).
+ * memory is for large pages.
  */
 static inline u64 __nv_gmmu_va_small_page_limit(void)
 {
-        if (tegra_platform_is_linsim())
-                return ((u64)SZ_1G * 2);
-        else
-                return ((u64)SZ_1G * 16);
+        return ((u64)SZ_1G * 16);
 }
 
 static inline int __nv_gmmu_va_is_upper(struct vm_gk20a *vm, u64 addr)