Merge tag 'mmc-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

[cascardo/linux.git] / drivers / gpu / drm / etnaviv / etnaviv_dump.c

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_dump.c b/drivers/gpu/drm/etnaviv/etnaviv_dump.c
index 4a29eea..2bef501 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_dump.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_dump.c
@@ -175,11 +175,13 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu)
        etnaviv_core_dump_registers(&iter, gpu);
        etnaviv_core_dump_mmu(&iter, gpu, mmu_size);
        etnaviv_core_dump_mem(&iter, ETDUMP_BUF_RING, gpu->buffer->vaddr,
-                             gpu->buffer->size, gpu->buffer->paddr);
+                             gpu->buffer->size,
+                             etnaviv_iommu_get_cmdbuf_va(gpu, gpu->buffer));
 
        list_for_each_entry(cmd, &gpu->active_cmd_list, node)
                etnaviv_core_dump_mem(&iter, ETDUMP_BUF_CMD, cmd->vaddr,
-                                     cmd->size, cmd->paddr);
+                                     cmd->size,
+                                     etnaviv_iommu_get_cmdbuf_va(gpu, cmd));
 
        /* Reserve space for the bomap */
        if (n_bomap_pages) {