From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
VMware Graphics <linux-graphics-maintainer@vmware.com>,
Thomas Hellstrom <thellstrom@vmware.com>,
Daniel Vetter <daniel.vetter@intel.com>
Subject: [PATCH 10/15] drm/vmwgfx: Delete mmaping functions
Date: Mon, 18 Nov 2019 11:35:31 +0100 [thread overview]
Message-ID: <20191118103536.17675-11-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20191118103536.17675-1-daniel.vetter@ffwll.ch>
No need for stubs, dma-buf.c takes care of that.
Aside, not having a ->release callback smelled like refcounting leak
somewhere. It will also score you a WARN_ON backtrace in dma-buf.c on
every export. But then I found that ttm_device_object_init overwrites
it. Overwriting const memory is not going to go down well in recent
kernels.
One more aside: The (un)map_dma_buf can't ever be called because
->attach rejects everything. Might want to drop a BUG_ON(1) in there.
Same for ->detach.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: VMware Graphics <linux-graphics-maintainer@vmware.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
---
drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 33 ---------------------------
1 file changed, 33 deletions(-)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
index e420675e8db3..d9552a1efd13 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
@@ -62,45 +62,12 @@ static void vmw_prime_unmap_dma_buf(struct dma_buf_attachment *attach,
{
}
-static void *vmw_prime_dmabuf_vmap(struct dma_buf *dma_buf)
-{
- return NULL;
-}
-
-static void vmw_prime_dmabuf_vunmap(struct dma_buf *dma_buf, void *vaddr)
-{
-}
-
-static void *vmw_prime_dmabuf_kmap(struct dma_buf *dma_buf,
- unsigned long page_num)
-{
- return NULL;
-}
-
-static void vmw_prime_dmabuf_kunmap(struct dma_buf *dma_buf,
- unsigned long page_num, void *addr)
-{
-
-}
-
-static int vmw_prime_dmabuf_mmap(struct dma_buf *dma_buf,
- struct vm_area_struct *vma)
-{
- WARN_ONCE(true, "Attempted use of dmabuf mmap. Bad.\n");
- return -ENOSYS;
-}
-
const struct dma_buf_ops vmw_prime_dmabuf_ops = {
.attach = vmw_prime_map_attach,
.detach = vmw_prime_map_detach,
.map_dma_buf = vmw_prime_map_dma_buf,
.unmap_dma_buf = vmw_prime_unmap_dma_buf,
.release = NULL,
- .map = vmw_prime_dmabuf_kmap,
- .unmap = vmw_prime_dmabuf_kunmap,
- .mmap = vmw_prime_dmabuf_mmap,
- .vmap = vmw_prime_dmabuf_vmap,
- .vunmap = vmw_prime_dmabuf_vunmap,
};
int vmw_prime_fd_to_handle(struct drm_device *dev,
--
2.24.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
VMware Graphics <linux-graphics-maintainer@vmware.com>,
Thomas Hellstrom <thellstrom@vmware.com>,
Daniel Vetter <daniel.vetter@intel.com>
Subject: [Intel-gfx] [PATCH 10/15] drm/vmwgfx: Delete mmaping functions
Date: Mon, 18 Nov 2019 11:35:31 +0100 [thread overview]
Message-ID: <20191118103536.17675-11-daniel.vetter@ffwll.ch> (raw)
Message-ID: <20191118103531.6-2tk0_Uxtcr-1DxyTbrkQ-K4na16WWvnOFxSJ-1hgo@z> (raw)
In-Reply-To: <20191118103536.17675-1-daniel.vetter@ffwll.ch>
No need for stubs, dma-buf.c takes care of that.
Aside, not having a ->release callback smelled like refcounting leak
somewhere. It will also score you a WARN_ON backtrace in dma-buf.c on
every export. But then I found that ttm_device_object_init overwrites
it. Overwriting const memory is not going to go down well in recent
kernels.
One more aside: The (un)map_dma_buf can't ever be called because
->attach rejects everything. Might want to drop a BUG_ON(1) in there.
Same for ->detach.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: VMware Graphics <linux-graphics-maintainer@vmware.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
---
drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 33 ---------------------------
1 file changed, 33 deletions(-)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
index e420675e8db3..d9552a1efd13 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
@@ -62,45 +62,12 @@ static void vmw_prime_unmap_dma_buf(struct dma_buf_attachment *attach,
{
}
-static void *vmw_prime_dmabuf_vmap(struct dma_buf *dma_buf)
-{
- return NULL;
-}
-
-static void vmw_prime_dmabuf_vunmap(struct dma_buf *dma_buf, void *vaddr)
-{
-}
-
-static void *vmw_prime_dmabuf_kmap(struct dma_buf *dma_buf,
- unsigned long page_num)
-{
- return NULL;
-}
-
-static void vmw_prime_dmabuf_kunmap(struct dma_buf *dma_buf,
- unsigned long page_num, void *addr)
-{
-
-}
-
-static int vmw_prime_dmabuf_mmap(struct dma_buf *dma_buf,
- struct vm_area_struct *vma)
-{
- WARN_ONCE(true, "Attempted use of dmabuf mmap. Bad.\n");
- return -ENOSYS;
-}
-
const struct dma_buf_ops vmw_prime_dmabuf_ops = {
.attach = vmw_prime_map_attach,
.detach = vmw_prime_map_detach,
.map_dma_buf = vmw_prime_map_dma_buf,
.unmap_dma_buf = vmw_prime_unmap_dma_buf,
.release = NULL,
- .map = vmw_prime_dmabuf_kmap,
- .unmap = vmw_prime_dmabuf_kunmap,
- .mmap = vmw_prime_dmabuf_mmap,
- .vmap = vmw_prime_dmabuf_vmap,
- .vunmap = vmw_prime_dmabuf_vunmap,
};
int vmw_prime_fd_to_handle(struct drm_device *dev,
--
2.24.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-11-18 10:35 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-18 10:35 [PATCH 00/15] Retire dma_buf_k(un)map Daniel Vetter
2019-11-18 10:35 ` [Intel-gfx] " Daniel Vetter
2019-11-18 10:35 ` [PATCH 01/15] drm/tegra: Map cmdbuf once for reloc processing Daniel Vetter
2019-11-18 10:35 ` [Intel-gfx] " Daniel Vetter
2019-11-25 9:58 ` Daniel Vetter
2019-11-25 9:58 ` [Intel-gfx] " Daniel Vetter
2019-11-25 10:47 ` Thierry Reding
2019-11-25 10:47 ` [Intel-gfx] " Thierry Reding
2019-11-25 11:02 ` Thierry Reding
2019-11-25 11:02 ` [Intel-gfx] " 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 ` [Intel-gfx] " Daniel Vetter
2019-11-25 11:04 ` Thierry Reding
2019-11-25 11:04 ` [Intel-gfx] " Thierry Reding
2019-11-18 10:35 ` [PATCH 03/15] drm/i915: Remove dma_buf_kmap selftest Daniel Vetter
2019-11-18 10:35 ` [Intel-gfx] " Daniel Vetter
2019-11-18 12:58 ` Chris Wilson
2019-11-18 12:58 ` [Intel-gfx] " Chris Wilson
2019-11-18 10:35 ` [PATCH 04/15] staging/android/ion: delete dma_buf->kmap/unmap implemenation Daniel Vetter
2019-11-18 10:35 ` [Intel-gfx] " Daniel Vetter
2019-11-18 11:26 ` Greg KH
2019-11-18 11:26 ` [Intel-gfx] " Greg KH
2019-11-18 14:55 ` Laura Abbott
2019-11-18 14:55 ` [Intel-gfx] " Laura Abbott
2019-11-18 10:35 ` [PATCH 05/15] drm/armada: Delete dma_buf->k(un)map implemenation Daniel Vetter
2019-11-18 10:35 ` [Intel-gfx] " Daniel Vetter
2019-11-25 21:44 ` Daniel Vetter
2019-11-25 21:44 ` [Intel-gfx] " Daniel Vetter
2019-11-26 0:35 ` Russell King - ARM Linux admin
2019-11-26 0:35 ` [Intel-gfx] " Russell King - ARM Linux admin
2019-11-26 8:33 ` Daniel Vetter
2019-11-26 8:33 ` [Intel-gfx] " Daniel Vetter
2019-11-18 10:35 ` [PATCH 06/15] drm/i915: Drop dma_buf->k(un)map Daniel Vetter
2019-11-18 10:35 ` [Intel-gfx] " Daniel Vetter
2019-11-18 11:38 ` Christian König
2019-11-18 11:38 ` [Intel-gfx] " Christian König
2019-11-18 12:53 ` Chris Wilson
2019-11-18 12:53 ` [Intel-gfx] " Chris Wilson
2019-11-18 10:35 ` [PATCH 07/15] drm/omapdrm: " Daniel Vetter
2019-11-18 10:35 ` [Intel-gfx] " Daniel Vetter
2019-11-18 12:44 ` Tomi Valkeinen
2019-11-18 12:44 ` [Intel-gfx] " Tomi Valkeinen
2019-11-18 10:35 ` [PATCH 08/15] drm/tegra: Remove dma_buf->k(un)map Daniel Vetter
2019-11-18 10:35 ` [Intel-gfx] " Daniel Vetter
2019-11-25 11:06 ` Thierry Reding
2019-11-25 11:06 ` [Intel-gfx] " Thierry Reding
2019-11-18 10:35 ` [PATCH 09/15] dma-buf: Drop dma_buf_k(un)map Daniel Vetter
2019-11-18 10:35 ` [Intel-gfx] " Daniel Vetter
2019-11-18 10:35 ` Daniel Vetter [this message]
2019-11-18 10:35 ` [Intel-gfx] [PATCH 10/15] drm/vmwgfx: Delete mmaping functions Daniel Vetter
2019-11-18 17:25 ` Thomas Hellstrom
2019-11-18 17:25 ` [Intel-gfx] " Thomas Hellstrom
2019-11-18 17:42 ` Daniel Vetter
2019-11-18 17:42 ` [Intel-gfx] " Daniel Vetter
2019-11-18 10:35 ` [PATCH 11/15] media/videobuf2: Drop dma_buf->k(un)map support Daniel Vetter
2019-11-18 10:35 ` [Intel-gfx] " Daniel Vetter
2019-11-18 10:58 ` Marek Szyprowski
2019-11-18 10:58 ` [Intel-gfx] " Marek Szyprowski
2019-11-18 11:02 ` Hans Verkuil
2019-11-18 11:02 ` [Intel-gfx] " Hans Verkuil
2019-11-18 10:35 ` [PATCH 12/15] drm/tee_shm: Drop dma_buf_k(unmap) support Daniel Vetter
2019-11-18 10:35 ` [Intel-gfx] " Daniel Vetter
2019-11-18 11:26 ` Greg Kroah-Hartman
2019-11-18 11:26 ` [Intel-gfx] " Greg Kroah-Hartman
2019-11-18 12:02 ` Jens Wiklander
2019-11-18 12:02 ` [Intel-gfx] " Jens Wiklander
2019-11-18 10:35 ` [PATCH 13/15] xen/gntdev-dmabuf: Ditch dummy map functions Daniel Vetter
2019-11-18 10:35 ` [Intel-gfx] " Daniel Vetter
2019-11-18 10:50 ` [Xen-devel] " Oleksandr Andrushchenko
2019-11-18 10:50 ` [Intel-gfx] " Oleksandr Andrushchenko
2019-11-18 10:53 ` Jürgen Groß
2019-11-18 10:53 ` [Intel-gfx] " Jürgen Groß
2019-11-18 10:35 ` [PATCH 14/15] sample/vfio-mdev/mbocs: Remove dma_buf_k(un)map support Daniel Vetter
2019-11-18 10:35 ` [Intel-gfx] " Daniel Vetter
2019-11-18 11:41 ` Gerd Hoffmann
2019-11-18 11:41 ` [Intel-gfx] " Gerd Hoffmann
2019-11-18 10:35 ` [PATCH 15/15] dma-buf: Remove kernel map/unmap hooks Daniel Vetter
2019-11-18 10:35 ` [Intel-gfx] " Daniel Vetter
2019-11-18 15:22 ` kbuild test robot
2019-11-18 15:22 ` [Intel-gfx] " kbuild test robot
2019-11-18 16:43 ` Daniel Vetter
2019-11-18 16:43 ` [Intel-gfx] " Daniel Vetter
2019-11-25 0:46 ` [kbuild-all] " Rong Chen
2019-11-25 0:46 ` [Intel-gfx] " Rong Chen
2019-11-26 10:54 ` Daniel Vetter
2019-11-26 10:54 ` [Intel-gfx] " Daniel Vetter
2019-11-18 12:36 ` ✗ Fi.CI.CHECKPATCH: warning for Retire dma_buf_k(un)map Patchwork
2019-11-18 12:36 ` [Intel-gfx] " Patchwork
2019-11-18 13:01 ` ✓ Fi.CI.BAT: success " Patchwork
2019-11-18 13:01 ` [Intel-gfx] " Patchwork
2019-11-18 15:58 ` [PATCH 00/15] " Sumit Semwal
2019-11-18 15:58 ` [Intel-gfx] " Sumit Semwal
2019-11-18 18:45 ` ✓ Fi.CI.IGT: success for " Patchwork
2019-11-18 18:45 ` [Intel-gfx] " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191118103536.17675-11-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-graphics-maintainer@vmware.com \
--cc=thellstrom@vmware.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox