OSDN Git Service

drm/omapdrm: Drop dma_buf->k(un)map
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 18 Nov 2019 10:35:28 +0000 (11:35 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 25 Nov 2019 21:36:14 +0000 (22:36 +0100)
No in-tree users left.

Note that this is one of the few (if only) implementations of dma-buf
that provided a kmap, but not a vmap implemenation. Given that the
only real user (in-tree at least) of kmap was tegra, and it's
impossible to buy a chip with tegra host1x and ompadrm on the same
SoC, there's no problem here.

Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Sumit Semwal <sumit.semwal@linaro.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191118103536.17675-8-daniel.vetter@ffwll.ch
drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c

index 7344bb6..b319fe7 100644 (file)
@@ -85,25 +85,6 @@ static int omap_gem_dmabuf_end_cpu_access(struct dma_buf *buffer,
        return 0;
 }
 
-static void *omap_gem_dmabuf_kmap(struct dma_buf *buffer,
-               unsigned long page_num)
-{
-       struct drm_gem_object *obj = buffer->priv;
-       struct page **pages;
-       omap_gem_get_pages(obj, &pages, false);
-       omap_gem_cpu_sync_page(obj, page_num);
-       return kmap(pages[page_num]);
-}
-
-static void omap_gem_dmabuf_kunmap(struct dma_buf *buffer,
-               unsigned long page_num, void *addr)
-{
-       struct drm_gem_object *obj = buffer->priv;
-       struct page **pages;
-       omap_gem_get_pages(obj, &pages, false);
-       kunmap(pages[page_num]);
-}
-
 static int omap_gem_dmabuf_mmap(struct dma_buf *buffer,
                struct vm_area_struct *vma)
 {
@@ -123,8 +104,6 @@ static const struct dma_buf_ops omap_dmabuf_ops = {
        .release = drm_gem_dmabuf_release,
        .begin_cpu_access = omap_gem_dmabuf_begin_cpu_access,
        .end_cpu_access = omap_gem_dmabuf_end_cpu_access,
-       .map = omap_gem_dmabuf_kmap,
-       .unmap = omap_gem_dmabuf_kunmap,
        .mmap = omap_gem_dmabuf_mmap,
 };