Commit 35bd71dd authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/tegra: Delete host1x_bo_ops->k(un)map 



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.

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: Jonathan Hunter <jonathanh@nvidia.com>
Cc: linux-tegra@vger.kernel.org
Link: https://patchwork.freedesktop.org/patch/msgid/20191118103536.17675-3-daniel.vetter@ffwll.ch
parent 7a8139c5

drivers/gpu/drm/tegra/gem.c

+0 −28
Original line number Diff line number Diff line
@@ -65,32 +65,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);
@@ -107,8 +81,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)

include/linux/host1x.h

+0 −13
Original line number Diff line number Diff line
@@ -68,8 +68,6 @@ struct host1x_bo_ops { 
	void (*unpin)(struct host1x_bo *bo, 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 {
@@ -113,17 +111,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

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE