* [PATCH 01/15] drm/tegra: Map cmdbuf once for reloc processing [not found] <20191118103536.17675-1-daniel.vetter@ffwll.ch> @ 2019-11-18 10:35 ` Daniel Vetter 2019-11-25 9:58 ` Daniel Vetter 2019-11-25 11:02 ` Thierry Reding 2019-11-18 10:35 ` [PATCH 02/15] drm/tegra: Delete host1x_bo_ops->k(un)map Daniel Vetter 2019-11-18 10:35 ` [PATCH 08/15] drm/tegra: Remove dma_buf->k(un)map Daniel Vetter 2 siblings, 2 replies; 8+ messages in thread From: Daniel Vetter @ 2019-11-18 10:35 UTC (permalink / raw) To: DRI Development Cc: linux-tegra, Daniel Vetter, Intel Graphics Development, Daniel Vetter 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. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: linux-tegra@vger.kernel.org --- drivers/gpu/host1x/job.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/host1x/job.c b/drivers/gpu/host1x/job.c index 25ca54de8fc5..60b2fedd0061 100644 --- a/drivers/gpu/host1x/job.c +++ b/drivers/gpu/host1x/job.c @@ -244,8 +244,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) { - u32 last_page = ~0; - void *cmdbuf_page_addr = NULL; + void *cmdbuf_addr = NULL; struct host1x_bo *cmdbuf = g->bo; unsigned int i; @@ -267,28 +266,22 @@ static int do_relocs(struct host1x_job *job, struct host1x_job_gather *g) goto patch_reloc; } - if (last_page != reloc->cmdbuf.offset >> PAGE_SHIFT) { - if (cmdbuf_page_addr) - host1x_bo_kunmap(cmdbuf, last_page, - cmdbuf_page_addr); + if (!cmdbuf_addr) { + cmdbuf_addr = host1x_bo_mmap(cmdbuf); - cmdbuf_page_addr = host1x_bo_kmap(cmdbuf, - reloc->cmdbuf.offset >> PAGE_SHIFT); - last_page = reloc->cmdbuf.offset >> PAGE_SHIFT; - - if (unlikely(!cmdbuf_page_addr)) { + if (unlikely(!cmdbuf_addr)) { pr_err("Could not map cmdbuf for relocation\n"); return -ENOMEM; } } - target = cmdbuf_page_addr + (reloc->cmdbuf.offset & ~PAGE_MASK); + target = cmdbuf_addr + reloc->cmdbuf.offset; patch_reloc: *target = reloc_addr; } - if (cmdbuf_page_addr) - host1x_bo_kunmap(cmdbuf, last_page, cmdbuf_page_addr); + if (cmdbuf_addr) + host1x_bo_munmap(cmdbuf, cmdbuf_addr); return 0; } -- 2.24.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 01/15] drm/tegra: Map cmdbuf once for reloc processing 2019-11-18 10:35 ` [PATCH 01/15] drm/tegra: Map cmdbuf once for reloc processing Daniel Vetter @ 2019-11-25 9:58 ` Daniel Vetter 2019-11-25 10:47 ` Thierry Reding 2019-11-25 11:02 ` Thierry Reding 1 sibling, 1 reply; 8+ messages in thread From: Daniel Vetter @ 2019-11-25 9:58 UTC (permalink / raw) To: DRI Development Cc: linux-tegra, Daniel Vetter, Intel Graphics Development, Daniel Vetter On Mon, Nov 18, 2019 at 11:35:22AM +0100, Daniel Vetter wrote: > 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. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Thierry Reding <thierry.reding@gmail.com> > Cc: linux-tegra@vger.kernel.org Ping for testing/review on these first 2 tegra patches. They're holding up the entire series, and I got acks for all the other bits surprisingly fast. So would like to land this rather sooner than later. I'm also working on a lot more dma-buf patches ... Thanks, Daniel > --- > drivers/gpu/host1x/job.c | 21 +++++++-------------- > 1 file changed, 7 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/host1x/job.c b/drivers/gpu/host1x/job.c > index 25ca54de8fc5..60b2fedd0061 100644 > --- a/drivers/gpu/host1x/job.c > +++ b/drivers/gpu/host1x/job.c > @@ -244,8 +244,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) > { > - u32 last_page = ~0; > - void *cmdbuf_page_addr = NULL; > + void *cmdbuf_addr = NULL; > struct host1x_bo *cmdbuf = g->bo; > unsigned int i; > > @@ -267,28 +266,22 @@ static int do_relocs(struct host1x_job *job, struct host1x_job_gather *g) > goto patch_reloc; > } > > - if (last_page != reloc->cmdbuf.offset >> PAGE_SHIFT) { > - if (cmdbuf_page_addr) > - host1x_bo_kunmap(cmdbuf, last_page, > - cmdbuf_page_addr); > + if (!cmdbuf_addr) { > + cmdbuf_addr = host1x_bo_mmap(cmdbuf); > > - cmdbuf_page_addr = host1x_bo_kmap(cmdbuf, > - reloc->cmdbuf.offset >> PAGE_SHIFT); > - last_page = reloc->cmdbuf.offset >> PAGE_SHIFT; > - > - if (unlikely(!cmdbuf_page_addr)) { > + if (unlikely(!cmdbuf_addr)) { > pr_err("Could not map cmdbuf for relocation\n"); > return -ENOMEM; > } > } > > - target = cmdbuf_page_addr + (reloc->cmdbuf.offset & ~PAGE_MASK); > + target = cmdbuf_addr + reloc->cmdbuf.offset; > patch_reloc: > *target = reloc_addr; > } > > - if (cmdbuf_page_addr) > - host1x_bo_kunmap(cmdbuf, last_page, cmdbuf_page_addr); > + if (cmdbuf_addr) > + host1x_bo_munmap(cmdbuf, cmdbuf_addr); > > return 0; > } > -- > 2.24.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 01/15] drm/tegra: Map cmdbuf once for reloc processing 2019-11-25 9:58 ` Daniel Vetter @ 2019-11-25 10:47 ` Thierry Reding 0 siblings, 0 replies; 8+ messages in thread From: Thierry Reding @ 2019-11-25 10:47 UTC (permalink / raw) To: Daniel Vetter Cc: linux-tegra, Daniel Vetter, Intel Graphics Development, DRI Development, Daniel Vetter [-- Attachment #1.1: Type: text/plain, Size: 3173 bytes --] On Mon, Nov 25, 2019 at 10:58:56AM +0100, Daniel Vetter wrote: > On Mon, Nov 18, 2019 at 11:35:22AM +0100, Daniel Vetter wrote: > > 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. > > > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > Cc: Thierry Reding <thierry.reding@gmail.com> > > Cc: linux-tegra@vger.kernel.org > > Ping for testing/review on these first 2 tegra patches. They're holding up > the entire series, and I got acks for all the other bits surprisingly > fast. So would like to land this rather sooner than later. I'm also > working on a lot more dma-buf patches ... Right, I had forgotten about this series. Let me go test it right away. Thierry > > --- > > drivers/gpu/host1x/job.c | 21 +++++++-------------- > > 1 file changed, 7 insertions(+), 14 deletions(-) > > > > diff --git a/drivers/gpu/host1x/job.c b/drivers/gpu/host1x/job.c > > index 25ca54de8fc5..60b2fedd0061 100644 > > --- a/drivers/gpu/host1x/job.c > > +++ b/drivers/gpu/host1x/job.c > > @@ -244,8 +244,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) > > { > > - u32 last_page = ~0; > > - void *cmdbuf_page_addr = NULL; > > + void *cmdbuf_addr = NULL; > > struct host1x_bo *cmdbuf = g->bo; > > unsigned int i; > > > > @@ -267,28 +266,22 @@ static int do_relocs(struct host1x_job *job, struct host1x_job_gather *g) > > goto patch_reloc; > > } > > > > - if (last_page != reloc->cmdbuf.offset >> PAGE_SHIFT) { > > - if (cmdbuf_page_addr) > > - host1x_bo_kunmap(cmdbuf, last_page, > > - cmdbuf_page_addr); > > + if (!cmdbuf_addr) { > > + cmdbuf_addr = host1x_bo_mmap(cmdbuf); > > > > - cmdbuf_page_addr = host1x_bo_kmap(cmdbuf, > > - reloc->cmdbuf.offset >> PAGE_SHIFT); > > - last_page = reloc->cmdbuf.offset >> PAGE_SHIFT; > > - > > - if (unlikely(!cmdbuf_page_addr)) { > > + if (unlikely(!cmdbuf_addr)) { > > pr_err("Could not map cmdbuf for relocation\n"); > > return -ENOMEM; > > } > > } > > > > - target = cmdbuf_page_addr + (reloc->cmdbuf.offset & ~PAGE_MASK); > > + target = cmdbuf_addr + reloc->cmdbuf.offset; > > patch_reloc: > > *target = reloc_addr; > > } > > > > - if (cmdbuf_page_addr) > > - host1x_bo_kunmap(cmdbuf, last_page, cmdbuf_page_addr); > > + if (cmdbuf_addr) > > + host1x_bo_munmap(cmdbuf, cmdbuf_addr); > > > > return 0; > > } > > -- > > 2.24.0 > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] [-- Attachment #2: Type: text/plain, Size: 159 bytes --] _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 01/15] drm/tegra: Map cmdbuf once for reloc processing 2019-11-18 10:35 ` [PATCH 01/15] drm/tegra: Map cmdbuf once for reloc processing Daniel Vetter 2019-11-25 9:58 ` Daniel Vetter @ 2019-11-25 11:02 ` Thierry Reding 1 sibling, 0 replies; 8+ messages in thread From: Thierry Reding @ 2019-11-25 11:02 UTC (permalink / raw) To: Daniel Vetter Cc: linux-tegra, Daniel Vetter, Intel Graphics Development, DRI Development [-- Attachment #1.1: Type: text/plain, Size: 2716 bytes --] On Mon, Nov 18, 2019 at 11:35:22AM +0100, Daniel Vetter wrote: > 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. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Thierry Reding <thierry.reding@gmail.com> > Cc: linux-tegra@vger.kernel.org > --- > drivers/gpu/host1x/job.c | 21 +++++++-------------- > 1 file changed, 7 insertions(+), 14 deletions(-) This looks correct to me, and running some of the grate project's tests against this works just fine, so: Reviewed-by: Thierry Reding <treding@nvidia.com> Tested-by: Thierry Reding <treding@nvidia.com> > diff --git a/drivers/gpu/host1x/job.c b/drivers/gpu/host1x/job.c > index 25ca54de8fc5..60b2fedd0061 100644 > --- a/drivers/gpu/host1x/job.c > +++ b/drivers/gpu/host1x/job.c > @@ -244,8 +244,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) > { > - u32 last_page = ~0; > - void *cmdbuf_page_addr = NULL; > + void *cmdbuf_addr = NULL; > struct host1x_bo *cmdbuf = g->bo; > unsigned int i; > > @@ -267,28 +266,22 @@ static int do_relocs(struct host1x_job *job, struct host1x_job_gather *g) > goto patch_reloc; > } > > - if (last_page != reloc->cmdbuf.offset >> PAGE_SHIFT) { > - if (cmdbuf_page_addr) > - host1x_bo_kunmap(cmdbuf, last_page, > - cmdbuf_page_addr); > + if (!cmdbuf_addr) { > + cmdbuf_addr = host1x_bo_mmap(cmdbuf); > > - cmdbuf_page_addr = host1x_bo_kmap(cmdbuf, > - reloc->cmdbuf.offset >> PAGE_SHIFT); > - last_page = reloc->cmdbuf.offset >> PAGE_SHIFT; > - > - if (unlikely(!cmdbuf_page_addr)) { > + if (unlikely(!cmdbuf_addr)) { > pr_err("Could not map cmdbuf for relocation\n"); > return -ENOMEM; > } > } > > - target = cmdbuf_page_addr + (reloc->cmdbuf.offset & ~PAGE_MASK); > + target = cmdbuf_addr + reloc->cmdbuf.offset; > patch_reloc: > *target = reloc_addr; > } > > - if (cmdbuf_page_addr) > - host1x_bo_kunmap(cmdbuf, last_page, cmdbuf_page_addr); > + if (cmdbuf_addr) > + host1x_bo_munmap(cmdbuf, cmdbuf_addr); > > return 0; > } > -- > 2.24.0 > [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] [-- Attachment #2: Type: text/plain, Size: 159 bytes --] _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 02/15] drm/tegra: Delete host1x_bo_ops->k(un)map [not found] <20191118103536.17675-1-daniel.vetter@ffwll.ch> 2019-11-18 10:35 ` [PATCH 01/15] drm/tegra: Map cmdbuf once for reloc processing Daniel Vetter @ 2019-11-18 10:35 ` Daniel Vetter 2019-11-25 11:04 ` Thierry Reding 2019-11-18 10:35 ` [PATCH 08/15] drm/tegra: Remove dma_buf->k(un)map Daniel Vetter 2 siblings, 1 reply; 8+ messages in thread From: Daniel Vetter @ 2019-11-18 10:35 UTC (permalink / raw) To: DRI Development Cc: Daniel Vetter, Intel Graphics Development, Jonathan Hunter, linux-tegra, Daniel Vetter It doesn't have any callers anymore. Aside: The ->mmap/munmap hooks have a bit a confusing name, they don't do userspace mmaps, but a kernel vmap. I think most places use vmap for this, except ttm, which uses kmap for vmap for added confusion. mmap seems entirely for userspace mappings set up through mmap(2) syscall. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: Jonathan Hunter <jonathanh@nvidia.com> Cc: linux-tegra@vger.kernel.org --- drivers/gpu/drm/tegra/gem.c | 28 ---------------------------- include/linux/host1x.h | 13 ------------- 2 files changed, 41 deletions(-) diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index 746dae32c484..662cb7c87ef5 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -103,32 +103,6 @@ static void tegra_bo_munmap(struct host1x_bo *bo, void *addr) vunmap(addr); } -static void *tegra_bo_kmap(struct host1x_bo *bo, unsigned int page) -{ - struct tegra_bo *obj = host1x_to_tegra_bo(bo); - - if (obj->vaddr) - return obj->vaddr + page * PAGE_SIZE; - else if (obj->gem.import_attach) - return dma_buf_kmap(obj->gem.import_attach->dmabuf, page); - else - return vmap(obj->pages + page, 1, VM_MAP, - pgprot_writecombine(PAGE_KERNEL)); -} - -static void tegra_bo_kunmap(struct host1x_bo *bo, unsigned int page, - void *addr) -{ - struct tegra_bo *obj = host1x_to_tegra_bo(bo); - - if (obj->vaddr) - return; - else if (obj->gem.import_attach) - dma_buf_kunmap(obj->gem.import_attach->dmabuf, page, addr); - else - vunmap(addr); -} - static struct host1x_bo *tegra_bo_get(struct host1x_bo *bo) { struct tegra_bo *obj = host1x_to_tegra_bo(bo); @@ -145,8 +119,6 @@ static const struct host1x_bo_ops tegra_bo_ops = { .unpin = tegra_bo_unpin, .mmap = tegra_bo_mmap, .munmap = tegra_bo_munmap, - .kmap = tegra_bo_kmap, - .kunmap = tegra_bo_kunmap, }; static int tegra_bo_iommu_map(struct tegra_drm *tegra, struct tegra_bo *bo) diff --git a/include/linux/host1x.h b/include/linux/host1x.h index 6f8d772591ba..6edeb9228c4e 100644 --- a/include/linux/host1x.h +++ b/include/linux/host1x.h @@ -72,8 +72,6 @@ struct host1x_bo_ops { void (*unpin)(struct device *dev, struct sg_table *sgt); void *(*mmap)(struct host1x_bo *bo); void (*munmap)(struct host1x_bo *bo, void *addr); - void *(*kmap)(struct host1x_bo *bo, unsigned int pagenum); - void (*kunmap)(struct host1x_bo *bo, unsigned int pagenum, void *addr); }; struct host1x_bo { @@ -119,17 +117,6 @@ static inline void host1x_bo_munmap(struct host1x_bo *bo, void *addr) bo->ops->munmap(bo, addr); } -static inline void *host1x_bo_kmap(struct host1x_bo *bo, unsigned int pagenum) -{ - return bo->ops->kmap(bo, pagenum); -} - -static inline void host1x_bo_kunmap(struct host1x_bo *bo, - unsigned int pagenum, void *addr) -{ - bo->ops->kunmap(bo, pagenum, addr); -} - /* * host1x syncpoints */ -- 2.24.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 02/15] drm/tegra: Delete host1x_bo_ops->k(un)map 2019-11-18 10:35 ` [PATCH 02/15] drm/tegra: Delete host1x_bo_ops->k(un)map Daniel Vetter @ 2019-11-25 11:04 ` Thierry Reding 0 siblings, 0 replies; 8+ messages in thread From: Thierry Reding @ 2019-11-25 11:04 UTC (permalink / raw) To: Daniel Vetter Cc: linux-tegra, Daniel Vetter, Intel Graphics Development, DRI Development, Jonathan Hunter [-- Attachment #1.1: Type: text/plain, Size: 967 bytes --] On Mon, Nov 18, 2019 at 11:35:23AM +0100, Daniel Vetter wrote: > It doesn't have any callers anymore. > > Aside: The ->mmap/munmap hooks have a bit a confusing name, they don't > do userspace mmaps, but a kernel vmap. I think most places use vmap > for this, except ttm, which uses kmap for vmap for added confusion. > mmap seems entirely for userspace mappings set up through mmap(2) > syscall. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Thierry Reding <thierry.reding@gmail.com> > Cc: Jonathan Hunter <jonathanh@nvidia.com> > Cc: linux-tegra@vger.kernel.org > --- > drivers/gpu/drm/tegra/gem.c | 28 ---------------------------- > include/linux/host1x.h | 13 ------------- > 2 files changed, 41 deletions(-) Tested along with the rest of the series and this is obviously right now that the only user is gone, so: Reviewed-by: Thierry Reding <treding@nvidia.com> Tested-by: Thierry Reding <treding@nvidia.com> [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] [-- Attachment #2: Type: text/plain, Size: 159 bytes --] _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 08/15] drm/tegra: Remove dma_buf->k(un)map [not found] <20191118103536.17675-1-daniel.vetter@ffwll.ch> 2019-11-18 10:35 ` [PATCH 01/15] drm/tegra: Map cmdbuf once for reloc processing Daniel Vetter 2019-11-18 10:35 ` [PATCH 02/15] drm/tegra: Delete host1x_bo_ops->k(un)map Daniel Vetter @ 2019-11-18 10:35 ` Daniel Vetter 2019-11-25 11:06 ` Thierry Reding 2 siblings, 1 reply; 8+ messages in thread From: Daniel Vetter @ 2019-11-18 10:35 UTC (permalink / raw) To: DRI Development Cc: Daniel Vetter, Intel Graphics Development, Jonathan Hunter, linux-tegra, Daniel Vetter No in-tree users left. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: Jonathan Hunter <jonathanh@nvidia.com> Cc: linux-tegra@vger.kernel.org --- drivers/gpu/drm/tegra/gem.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index 662cb7c87ef5..84bb29070536 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -585,16 +585,6 @@ static int tegra_gem_prime_end_cpu_access(struct dma_buf *buf, return 0; } -static void *tegra_gem_prime_kmap(struct dma_buf *buf, unsigned long page) -{ - return NULL; -} - -static void tegra_gem_prime_kunmap(struct dma_buf *buf, unsigned long page, - void *addr) -{ -} - static int tegra_gem_prime_mmap(struct dma_buf *buf, struct vm_area_struct *vma) { struct drm_gem_object *gem = buf->priv; @@ -625,8 +615,6 @@ static const struct dma_buf_ops tegra_gem_prime_dmabuf_ops = { .release = tegra_gem_prime_release, .begin_cpu_access = tegra_gem_prime_begin_cpu_access, .end_cpu_access = tegra_gem_prime_end_cpu_access, - .map = tegra_gem_prime_kmap, - .unmap = tegra_gem_prime_kunmap, .mmap = tegra_gem_prime_mmap, .vmap = tegra_gem_prime_vmap, .vunmap = tegra_gem_prime_vunmap, -- 2.24.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 08/15] drm/tegra: Remove dma_buf->k(un)map 2019-11-18 10:35 ` [PATCH 08/15] drm/tegra: Remove dma_buf->k(un)map Daniel Vetter @ 2019-11-25 11:06 ` Thierry Reding 0 siblings, 0 replies; 8+ messages in thread From: Thierry Reding @ 2019-11-25 11:06 UTC (permalink / raw) To: Daniel Vetter Cc: linux-tegra, Daniel Vetter, Intel Graphics Development, DRI Development, Jonathan Hunter [-- Attachment #1.1: Type: text/plain, Size: 676 bytes --] On Mon, Nov 18, 2019 at 11:35:29AM +0100, Daniel Vetter wrote: > No in-tree users left. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Thierry Reding <thierry.reding@gmail.com> > Cc: Jonathan Hunter <jonathanh@nvidia.com> > Cc: linux-tegra@vger.kernel.org > --- > drivers/gpu/drm/tegra/gem.c | 12 ------------ > 1 file changed, 12 deletions(-) Same as before, I don't see any regressions when running some of the grate tests, and there's obviously no longer any reason to keep these functions around given that they are no longer used, so: Reviewed-by: Thierry Reding <treding@nvidia.com> Tested-by: Thierry Reding <treding@nvidia.com> [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] [-- Attachment #2: Type: text/plain, Size: 159 bytes --] _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-11-25 11:06 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20191118103536.17675-1-daniel.vetter@ffwll.ch>
2019-11-18 10:35 ` [PATCH 01/15] drm/tegra: Map cmdbuf once for reloc processing Daniel Vetter
2019-11-25 9:58 ` Daniel Vetter
2019-11-25 10:47 ` Thierry Reding
2019-11-25 11:02 ` Thierry Reding
2019-11-18 10:35 ` [PATCH 02/15] drm/tegra: Delete host1x_bo_ops->k(un)map Daniel Vetter
2019-11-25 11:04 ` Thierry Reding
2019-11-18 10:35 ` [PATCH 08/15] drm/tegra: Remove dma_buf->k(un)map Daniel Vetter
2019-11-25 11:06 ` Thierry Reding
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).