diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/gmmu.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/gmmu.h | 8 |
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, | |||
753 | .aperture = aperture | 753 | .aperture = aperture |
754 | }; | 754 | }; |
755 | 755 | ||
756 | #ifdef CONFIG_TEGRA_19x_GPU | ||
757 | nvgpu_gmmu_add_t19x_attrs(&attrs, flags); | ||
758 | #endif | ||
759 | |||
756 | /* | 760 | /* |
757 | * Only allocate a new GPU VA range if we haven't already been passed a | 761 | * Only allocate a new GPU VA range if we haven't already been passed a |
758 | * GPU VA range. This facilitates fixed mappings. | 762 | * 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 @@ | |||
23 | #include <nvgpu/rbtree.h> | 23 | #include <nvgpu/rbtree.h> |
24 | #include <nvgpu/lock.h> | 24 | #include <nvgpu/lock.h> |
25 | 25 | ||
26 | #ifdef CONFIG_TEGRA_19x_GPU | ||
27 | #include <nvgpu/gmmu_t19x.h> | ||
28 | #endif | ||
29 | |||
26 | struct scatterlist; | 30 | struct scatterlist; |
27 | 31 | ||
28 | /* | 32 | /* |
@@ -171,6 +175,10 @@ struct nvgpu_gmmu_attrs { | |||
171 | bool valid; | 175 | bool valid; |
172 | enum nvgpu_aperture aperture; | 176 | enum nvgpu_aperture aperture; |
173 | bool debug; | 177 | bool debug; |
178 | |||
179 | #ifdef CONFIG_TEGRA_19x_GPU | ||
180 | struct nvgpu_gmmu_attrs_t19x t19x_attrs; | ||
181 | #endif | ||
174 | }; | 182 | }; |
175 | 183 | ||
176 | struct gk20a_mmu_level { | 184 | struct gk20a_mmu_level { |