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_drv.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_drv.c')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_drv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c index 590be0d..587e450 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c @@ -18,11 +18,11 @@ #include <linux/of_platform.h> #include <drm/drm_of.h> +#include "etnaviv_cmdbuf.h" #include "etnaviv_drv.h" #include "etnaviv_gpu.h" #include "etnaviv_gem.h" #include "etnaviv_mmu.h" -#include "etnaviv_gem.h" #ifdef CONFIG_DRM_ETNAVIV_REGISTER_LOGGING static bool reglog; @@ -177,7 +177,8 @@ static void etnaviv_buffer_dump(struct etnaviv_gpu *gpu, struct seq_file *m) u32 i; seq_printf(m, "virt %p - phys 0x%llx - free 0x%08x\n", - buf->vaddr, (u64)buf->paddr, size - buf->user_size); + buf->vaddr, (u64)etnaviv_cmdbuf_get_pa(buf), + size - buf->user_size); for (i = 0; i < size / 4; i++) { if (i && !(i % 4)) |
