diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/gmmu.c | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 7 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/mm_gp10b.c | 7 |
3 files changed, 13 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/common/mm/gmmu.c b/drivers/gpu/nvgpu/common/mm/gmmu.c index dcb53c2a..1f3519aa 100644 --- a/drivers/gpu/nvgpu/common/mm/gmmu.c +++ b/drivers/gpu/nvgpu/common/mm/gmmu.c | |||
@@ -666,7 +666,7 @@ static int __nvgpu_gmmu_update_page_table(struct vm_gk20a *vm, | |||
666 | "vm=%s " | 666 | "vm=%s " |
667 | "%-5s GPU virt %#-12llx +%#-9llx phys %#-12llx " | 667 | "%-5s GPU virt %#-12llx +%#-9llx phys %#-12llx " |
668 | "phys offset: %#-4llx; pgsz: %3dkb perm=%-2s | " | 668 | "phys offset: %#-4llx; pgsz: %3dkb perm=%-2s | " |
669 | "kind=%#02x APT=%-6s %c%c%c", | 669 | "kind=%#02x APT=%-6s %c%c%c%c%c", |
670 | vm->name, | 670 | vm->name, |
671 | sgt ? "MAP" : "UNMAP", | 671 | sgt ? "MAP" : "UNMAP", |
672 | virt_addr, | 672 | virt_addr, |
@@ -677,9 +677,11 @@ static int __nvgpu_gmmu_update_page_table(struct vm_gk20a *vm, | |||
677 | nvgpu_gmmu_perm_str(attrs->rw_flag), | 677 | nvgpu_gmmu_perm_str(attrs->rw_flag), |
678 | attrs->kind_v, | 678 | attrs->kind_v, |
679 | nvgpu_aperture_str(attrs->aperture), | 679 | nvgpu_aperture_str(attrs->aperture), |
680 | attrs->cacheable ? 'C' : 'V', /* C = cached, V = volatile. */ | 680 | attrs->cacheable ? 'C' : 'c', /* C = cached, V = volatile. */ |
681 | attrs->sparse ? 'S' : '-', | 681 | attrs->sparse ? 'S' : '-', |
682 | attrs->priv ? 'P' : '-'); | 682 | attrs->priv ? 'P' : '-', |
683 | attrs->coherent ? 'c' : '-', | ||
684 | attrs->valid ? 'V' : '-'); | ||
683 | 685 | ||
684 | /* | 686 | /* |
685 | * Handle VIDMEM progamming. Currently uses a different scatter list | 687 | * Handle VIDMEM progamming. Currently uses a different scatter list |
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index 0a84cabb..759e6a2b 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -1700,7 +1700,7 @@ static void update_gmmu_pte_locked(struct vm_gk20a *vm, | |||
1700 | pte_dbg(g, attrs, | 1700 | pte_dbg(g, attrs, |
1701 | "PTE: i=%-4u size=%-2u offs=%-4u | " | 1701 | "PTE: i=%-4u size=%-2u offs=%-4u | " |
1702 | "GPU %#-12llx phys %#-12llx " | 1702 | "GPU %#-12llx phys %#-12llx " |
1703 | "pgsz: %3dkb perm=%-2s kind=%#02x APT=%-6s %c%c%c%c " | 1703 | "pgsz: %3dkb perm=%-2s kind=%#02x APT=%-6s %c%c%c%c%c " |
1704 | "ctag=0x%08x " | 1704 | "ctag=0x%08x " |
1705 | "[0x%08x, 0x%08x]", | 1705 | "[0x%08x, 0x%08x]", |
1706 | pd_idx, l->entry_size, pd_offset, | 1706 | pd_idx, l->entry_size, pd_offset, |
@@ -1709,10 +1709,11 @@ static void update_gmmu_pte_locked(struct vm_gk20a *vm, | |||
1709 | nvgpu_gmmu_perm_str(attrs->rw_flag), | 1709 | nvgpu_gmmu_perm_str(attrs->rw_flag), |
1710 | attrs->kind_v, | 1710 | attrs->kind_v, |
1711 | nvgpu_aperture_str(attrs->aperture), | 1711 | nvgpu_aperture_str(attrs->aperture), |
1712 | attrs->valid ? 'V' : '-', | 1712 | attrs->cacheable ? 'C' : 'v', |
1713 | attrs->cacheable ? 'C' : '-', | ||
1714 | attrs->sparse ? 'S' : '-', | 1713 | attrs->sparse ? 'S' : '-', |
1715 | attrs->priv ? 'P' : '-', | 1714 | attrs->priv ? 'P' : '-', |
1715 | attrs->coherent ? 'c' : '-', | ||
1716 | attrs->valid ? 'V' : '-', | ||
1716 | (u32)attrs->ctag >> ctag_shift, | 1717 | (u32)attrs->ctag >> ctag_shift, |
1717 | pte_w[1], pte_w[0]); | 1718 | pte_w[1], pte_w[0]); |
1718 | 1719 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c index bdc30143..612d59f7 100644 --- a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c | |||
@@ -288,7 +288,7 @@ static void update_gmmu_pte_locked(struct vm_gk20a *vm, | |||
288 | "vm=%s " | 288 | "vm=%s " |
289 | "PTE: i=%-4u size=%-2u offs=%-4u | " | 289 | "PTE: i=%-4u size=%-2u offs=%-4u | " |
290 | "GPU %#-12llx phys %#-12llx " | 290 | "GPU %#-12llx phys %#-12llx " |
291 | "pgsz: %3dkb perm=%-2s kind=%#02x APT=%-6s %c%c%c%c " | 291 | "pgsz: %3dkb perm=%-2s kind=%#02x APT=%-6s %c%c%c%c%c " |
292 | "ctag=0x%08x " | 292 | "ctag=0x%08x " |
293 | "[0x%08x, 0x%08x]", | 293 | "[0x%08x, 0x%08x]", |
294 | vm->name, | 294 | vm->name, |
@@ -298,10 +298,11 @@ static void update_gmmu_pte_locked(struct vm_gk20a *vm, | |||
298 | nvgpu_gmmu_perm_str(attrs->rw_flag), | 298 | nvgpu_gmmu_perm_str(attrs->rw_flag), |
299 | attrs->kind_v, | 299 | attrs->kind_v, |
300 | nvgpu_aperture_str(attrs->aperture), | 300 | nvgpu_aperture_str(attrs->aperture), |
301 | attrs->valid ? 'V' : '-', | 301 | attrs->cacheable ? 'C' : 'v', |
302 | attrs->cacheable ? 'C' : '-', | ||
303 | attrs->sparse ? 'S' : '-', | 302 | attrs->sparse ? 'S' : '-', |
304 | attrs->priv ? 'P' : '-', | 303 | attrs->priv ? 'P' : '-', |
304 | attrs->coherent ? 'c' : '-', | ||
305 | attrs->valid ? 'V' : '-', | ||
305 | (u32)attrs->ctag / g->ops.fb.compression_page_size(g), | 306 | (u32)attrs->ctag / g->ops.fb.compression_page_size(g), |
306 | pte_w[1], pte_w[0]); | 307 | pte_w[1], pte_w[0]); |
307 | 308 | ||