diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-02-03 11:09:25 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-02-03 11:09:36 +0100 |
| commit | 17aad8a340e6f98b62c2482d02bc3814eebde9a5 (patch) | |
| tree | b03fc5a159452bd24cde6e08f29bc66ce6bfa154 /drivers/gpu/drm/etnaviv/etnaviv_dump.c | |
| parent | 7e6328fd1f84f366b4cc17dc757025f485139f1a (diff) | |
| parent | 99743ae4c5f52f8f8ceb17783056fcc9b4f8b64c (diff) | |
| download | op-kernel-dev-17aad8a340e6f98b62c2482d02bc3814eebde9a5.zip op-kernel-dev-17aad8a340e6f98b62c2482d02bc3814eebde9a5.tar.gz | |
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next
Yet another backmerge to get at latest etnaviv code, which is need for
Chris' drm_mm patch.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/etnaviv/etnaviv_dump.c')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_dump.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_dump.c b/drivers/gpu/drm/etnaviv/etnaviv_dump.c index af65491..d019b5e 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_dump.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_dump.c @@ -15,6 +15,7 @@ */ #include <linux/devcoredump.h> +#include "etnaviv_cmdbuf.h" #include "etnaviv_dump.h" #include "etnaviv_gem.h" #include "etnaviv_gpu.h" @@ -177,12 +178,11 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu) etnaviv_core_dump_mmu(&iter, gpu, mmu_size); etnaviv_core_dump_mem(&iter, ETDUMP_BUF_RING, gpu->buffer->vaddr, gpu->buffer->size, - etnaviv_iommu_get_cmdbuf_va(gpu, gpu->buffer)); + etnaviv_cmdbuf_get_va(gpu->buffer)); list_for_each_entry(cmd, &gpu->active_cmd_list, node) etnaviv_core_dump_mem(&iter, ETDUMP_BUF_CMD, cmd->vaddr, - cmd->size, - etnaviv_iommu_get_cmdbuf_va(gpu, cmd)); + cmd->size, etnaviv_cmdbuf_get_va(cmd)); /* Reserve space for the bomap */ if (n_bomap_pages) { |
