Commit 7a8139c5 authored by Daniel Vetter's avatar Daniel Vetter

drm/tegra: Map cmdbuf once for reloc processing

A few reasons to drop kmap:

- For native objects all we do is look at obj->vaddr anyway, so might
  as well not call functions for every page.

- Reloc-processing on dma-buf is ... questionable.

- Plus most dma-buf that bother kernel cpu mmaps give you at least
  vmap, much less kmaps. And all the ones relevant for arm-soc are
  again doing a obj->vaddr game anyway, there's no real kmap going on
  on arm it seems.

Plus this seems to be the only real in-tree user of dma_buf_kmap, and
I'd like to get rid of that.
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Tested-by: default avatarThierry Reding <treding@nvidia.com>
Acked-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: linux-tegra@vger.kernel.org
Link: https://patchwork.freedesktop.org/patch/msgid/20191118103536.17675-2-daniel.vetter@ffwll.ch
parent f053c83a
...@@ -186,8 +186,7 @@ static unsigned int pin_job(struct host1x *host, struct host1x_job *job) ...@@ -186,8 +186,7 @@ static unsigned int pin_job(struct host1x *host, struct host1x_job *job)
static int do_relocs(struct host1x_job *job, struct host1x_job_gather *g) static int do_relocs(struct host1x_job *job, struct host1x_job_gather *g)
{ {
u32 last_page = ~0; void *cmdbuf_addr = NULL;
void *cmdbuf_page_addr = NULL;
struct host1x_bo *cmdbuf = g->bo; struct host1x_bo *cmdbuf = g->bo;
unsigned int i; unsigned int i;
...@@ -209,28 +208,22 @@ static int do_relocs(struct host1x_job *job, struct host1x_job_gather *g) ...@@ -209,28 +208,22 @@ static int do_relocs(struct host1x_job *job, struct host1x_job_gather *g)
goto patch_reloc; goto patch_reloc;
} }
if (last_page != reloc->cmdbuf.offset >> PAGE_SHIFT) { if (!cmdbuf_addr) {
if (cmdbuf_page_addr) cmdbuf_addr = host1x_bo_mmap(cmdbuf);
host1x_bo_kunmap(cmdbuf, last_page,
cmdbuf_page_addr);
cmdbuf_page_addr = host1x_bo_kmap(cmdbuf, if (unlikely(!cmdbuf_addr)) {
reloc->cmdbuf.offset >> PAGE_SHIFT);
last_page = reloc->cmdbuf.offset >> PAGE_SHIFT;
if (unlikely(!cmdbuf_page_addr)) {
pr_err("Could not map cmdbuf for relocation\n"); pr_err("Could not map cmdbuf for relocation\n");
return -ENOMEM; return -ENOMEM;
} }
} }
target = cmdbuf_page_addr + (reloc->cmdbuf.offset & ~PAGE_MASK); target = cmdbuf_addr + reloc->cmdbuf.offset;
patch_reloc: patch_reloc:
*target = reloc_addr; *target = reloc_addr;
} }
if (cmdbuf_page_addr) if (cmdbuf_addr)
host1x_bo_kunmap(cmdbuf, last_page, cmdbuf_page_addr); host1x_bo_munmap(cmdbuf, cmdbuf_addr);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment