diff --git a/drivers/gpu/nvgpu/common/mm/gmmu.c b/drivers/gpu/nvgpu/common/mm/gmmu.c index dcb53c2ac..1f3519aab 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, "vm=%s " "%-5s GPU virt %#-12llx +%#-9llx phys %#-12llx " "phys offset: %#-4llx; pgsz: %3dkb perm=%-2s | " - "kind=%#02x APT=%-6s %c%c%c", + "kind=%#02x APT=%-6s %c%c%c%c%c", vm->name, sgt ? "MAP" : "UNMAP", virt_addr, @@ -677,9 +677,11 @@ static int __nvgpu_gmmu_update_page_table(struct vm_gk20a *vm, nvgpu_gmmu_perm_str(attrs->rw_flag), attrs->kind_v, nvgpu_aperture_str(attrs->aperture), - attrs->cacheable ? 'C' : 'V', /* C = cached, V = volatile. */ + attrs->cacheable ? 'C' : 'c', /* C = cached, V = volatile. */ attrs->sparse ? 'S' : '-', - attrs->priv ? 'P' : '-'); + attrs->priv ? 'P' : '-', + attrs->coherent ? 'c' : '-', + attrs->valid ? 'V' : '-'); /* * 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 0a84cabb9..759e6a2b7 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, pte_dbg(g, attrs, "PTE: i=%-4u size=%-2u offs=%-4u | " "GPU %#-12llx phys %#-12llx " - "pgsz: %3dkb perm=%-2s kind=%#02x APT=%-6s %c%c%c%c " + "pgsz: %3dkb perm=%-2s kind=%#02x APT=%-6s %c%c%c%c%c " "ctag=0x%08x " "[0x%08x, 0x%08x]", pd_idx, l->entry_size, pd_offset, @@ -1709,10 +1709,11 @@ static void update_gmmu_pte_locked(struct vm_gk20a *vm, nvgpu_gmmu_perm_str(attrs->rw_flag), attrs->kind_v, nvgpu_aperture_str(attrs->aperture), - attrs->valid ? 'V' : '-', - attrs->cacheable ? 'C' : '-', + attrs->cacheable ? 'C' : 'v', attrs->sparse ? 'S' : '-', attrs->priv ? 'P' : '-', + attrs->coherent ? 'c' : '-', + attrs->valid ? 'V' : '-', (u32)attrs->ctag >> ctag_shift, pte_w[1], pte_w[0]); diff --git a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c index bdc301433..612d59f7f 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, "vm=%s " "PTE: i=%-4u size=%-2u offs=%-4u | " "GPU %#-12llx phys %#-12llx " - "pgsz: %3dkb perm=%-2s kind=%#02x APT=%-6s %c%c%c%c " + "pgsz: %3dkb perm=%-2s kind=%#02x APT=%-6s %c%c%c%c%c " "ctag=0x%08x " "[0x%08x, 0x%08x]", vm->name, @@ -298,10 +298,11 @@ static void update_gmmu_pte_locked(struct vm_gk20a *vm, nvgpu_gmmu_perm_str(attrs->rw_flag), attrs->kind_v, nvgpu_aperture_str(attrs->aperture), - attrs->valid ? 'V' : '-', - attrs->cacheable ? 'C' : '-', + attrs->cacheable ? 'C' : 'v', attrs->sparse ? 'S' : '-', attrs->priv ? 'P' : '-', + attrs->coherent ? 'c' : '-', + attrs->valid ? 'V' : '-', (u32)attrs->ctag / g->ops.fb.compression_page_size(g), pte_w[1], pte_w[0]);