gpu: nvgpu: Do not generate any ctag info unless enabled

Do not put any ctag data in the PTEs unless compression is
actually enabled for the mapping.

Bug 1732449
JIRA DNVGPU-12

Change-Id: I2abfbf9d1282af24541f8199bd9fbf2133c12899
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1133790
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
index 31fad8ae..579441f0 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
@@ -2435,10 +2435,9 @@ static int update_gmmu_pte_locked(struct vm_gk20a *vm,
                         gmmu_pte_kind_f(kind_v) |
                         gmmu_pte_comptagline_f((u32)(*ctag >> ctag_shift));
 
-                if (vm->mm->use_full_comp_tag_line && *iova & 0x10000) {
+                if (*ctag && vm->mm->use_full_comp_tag_line && *iova & 0x10000)
                         pte_w[1] |= gmmu_pte_comptagline_f(
                                         1 << (gmmu_pte_comptagline_s() - 1));
-                }
 
                 if (rw_flag == gk20a_mem_flag_read_only) {
                         pte_w[0] |= gmmu_pte_read_only_true_f();