diff options
author | Alex Waterman <alexw@nvidia.com> | 2016-04-27 13:42:15 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-04-29 17:46:18 -0400 |
commit | a4ca63f4332a50e3fd2108d01ce452c0e607a216 (patch) | |
tree | 74433d9ebfce91a6ec49b640811f134ce29056ab | |
parent | 77909044167ca8b65f4a8ad18f21949cfcf622fd (diff) |
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>
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 3 |
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, | |||
2435 | gmmu_pte_kind_f(kind_v) | | 2435 | gmmu_pte_kind_f(kind_v) | |
2436 | gmmu_pte_comptagline_f((u32)(*ctag >> ctag_shift)); | 2436 | gmmu_pte_comptagline_f((u32)(*ctag >> ctag_shift)); |
2437 | 2437 | ||
2438 | if (vm->mm->use_full_comp_tag_line && *iova & 0x10000) { | 2438 | if (*ctag && vm->mm->use_full_comp_tag_line && *iova & 0x10000) |
2439 | pte_w[1] |= gmmu_pte_comptagline_f( | 2439 | pte_w[1] |= gmmu_pte_comptagline_f( |
2440 | 1 << (gmmu_pte_comptagline_s() - 1)); | 2440 | 1 << (gmmu_pte_comptagline_s() - 1)); |
2441 | } | ||
2442 | 2441 | ||
2443 | if (rw_flag == gk20a_mem_flag_read_only) { | 2442 | if (rw_flag == gk20a_mem_flag_read_only) { |
2444 | pte_w[0] |= gmmu_pte_read_only_true_f(); | 2443 | pte_w[0] |= gmmu_pte_read_only_true_f(); |