gpu: nvgpu: Add t19x GMMU attributes

Add t19x specific flags into the GMMU attributes struct.

Jira GPUT19X-10
Bug 200279508

Change-Id: Ib45b83705fa1ca4ff6d14da0a2f132050e7d2cd5
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master/r/1514876
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Tested-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>

2 files changed, 12 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/common/mm/gmmu.c b/drivers/gpu/nvgpu/common/mm/gmmu.c
index 2abe87c9..dcb53c2a 100644
--- a/drivers/gpu/nvgpu/common/mm/gmmu.c
+++ b/drivers/gpu/nvgpu/common/mm/gmmu.c
@@ -753,6 +753,10 @@ u64 gk20a_locked_gmmu_map(struct vm_gk20a *vm,
                 .aperture  = aperture
         };
 
+#ifdef CONFIG_TEGRA_19x_GPU
+        nvgpu_gmmu_add_t19x_attrs(&attrs, flags);
+#endif
+
         /*
          * Only allocate a new GPU VA range if we haven't already been passed a
          * GPU VA range. This facilitates fixed mappings.
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gmmu.h b/drivers/gpu/nvgpu/include/nvgpu/gmmu.h
index 47af2f75..92e5eb5f 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gmmu.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gmmu.h
@@ -23,6 +23,10 @@
 #include <nvgpu/rbtree.h>
 #include <nvgpu/lock.h>
 
+#ifdef CONFIG_TEGRA_19x_GPU
+#include <nvgpu/gmmu_t19x.h>
+#endif
+
 struct scatterlist;
 
 /*
@@ -171,6 +175,10 @@ struct nvgpu_gmmu_attrs {
         bool                     valid;
         enum nvgpu_aperture      aperture;
         bool                     debug;
+
+#ifdef CONFIG_TEGRA_19x_GPU
+        struct nvgpu_gmmu_attrs_t19x t19x_attrs;
+#endif
 };
 
 struct gk20a_mmu_level {