From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org, posciak@chromium.org,
m.szyprowski@samsung.com, kyungmin.park@samsung.com,
hverkuil@xs4all.nl, sumit.semwal@linaro.org, robdclark@gmail.com,
daniel.vetter@ffwll.ch, labbott@redhat.com
Subject: [RFC v3.1 05/14] vb2: Anticipate queue specific DMA attributes for USERPTR buffers
Date: Thu, 13 Apr 2017 18:09:21 +0300 [thread overview]
Message-ID: <1492096161-18018-1-git-send-email-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <1492070239-21532-6-git-send-email-sakari.ailus@linux.intel.com>
The DMA attributes were available for the memop implementation for MMAP
buffers but not for USERPTR buffers. Do the same for USERPTR. This patch
makes no functional changes.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
since RFC v1:
- Add missing q->dma_attrs argument to call_ptr_memop(vb, get_userptr...
drivers/media/v4l2-core/videobuf2-core.c | 2 +-
drivers/media/v4l2-core/videobuf2-dma-contig.c | 3 ++-
drivers/media/v4l2-core/videobuf2-dma-sg.c | 3 ++-
drivers/media/v4l2-core/videobuf2-vmalloc.c | 3 ++-
include/media/videobuf2-core.h | 3 ++-
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
index e866115..c659b64 100644
--- a/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@ -1025,7 +1025,7 @@ static int __prepare_userptr(struct vb2_buffer *vb, const void *pb)
mem_priv = call_ptr_memop(vb, get_userptr,
q->alloc_devs[plane] ? : q->dev,
planes[plane].m.userptr,
- planes[plane].length, dma_dir);
+ planes[plane].length, dma_dir, q->dma_attrs);
if (IS_ERR(mem_priv)) {
dprintk(1, "failed acquiring userspace memory for plane %d\n",
plane);
diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
index d29a07f..30082a4 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
@@ -475,7 +475,8 @@ static inline dma_addr_t vb2_dc_pfn_to_dma(struct device *dev, unsigned long pfn
#endif
static void *vb2_dc_get_userptr(struct device *dev, unsigned long vaddr,
- unsigned long size, enum dma_data_direction dma_dir)
+ unsigned long size, enum dma_data_direction dma_dir,
+ unsigned long attrs)
{
struct vb2_dc_buf *buf;
struct frame_vector *vec;
diff --git a/drivers/media/v4l2-core/videobuf2-dma-sg.c b/drivers/media/v4l2-core/videobuf2-dma-sg.c
index 29fde1a..102ddb2 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
@@ -220,7 +220,8 @@ static void vb2_dma_sg_finish(void *buf_priv)
static void *vb2_dma_sg_get_userptr(struct device *dev, unsigned long vaddr,
unsigned long size,
- enum dma_data_direction dma_dir)
+ enum dma_data_direction dma_dir,
+ unsigned long dma_attrs)
{
struct vb2_dma_sg_buf *buf;
struct sg_table *sgt;
diff --git a/drivers/media/v4l2-core/videobuf2-vmalloc.c b/drivers/media/v4l2-core/videobuf2-vmalloc.c
index f83253a..a4914fc 100644
--- a/drivers/media/v4l2-core/videobuf2-vmalloc.c
+++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c
@@ -73,7 +73,8 @@ static void vb2_vmalloc_put(void *buf_priv)
static void *vb2_vmalloc_get_userptr(struct device *dev, unsigned long vaddr,
unsigned long size,
- enum dma_data_direction dma_dir)
+ enum dma_data_direction dma_dir,
+ unsigned long dma_attrs)
{
struct vb2_vmalloc_buf *buf;
struct frame_vector *vec;
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index cb97c22..4172f6e 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -122,7 +122,8 @@ struct vb2_mem_ops {
void *(*get_userptr)(struct device *dev, unsigned long vaddr,
unsigned long size,
- enum dma_data_direction dma_dir);
+ enum dma_data_direction dma_dir,
+ unsigned long dma_attrs);
void (*put_userptr)(void *buf_priv);
void (*prepare)(void *buf_priv);
--
2.7.4
next prev parent reply other threads:[~2017-04-13 15:09 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-13 7:57 [RFC v3 00/14] vb2: Handle user cache hints, allow drivers to choose cache coherency Sakari Ailus
2017-04-13 7:57 ` [RFC v3 01/14] vb2: Rename confusingly named internal buffer preparation functions Sakari Ailus
2017-04-13 7:57 ` [RFC v3 02/14] vb2: Move buffer cache synchronisation to prepare from queue Sakari Ailus
2017-04-13 7:57 ` [RFC v3 03/14] vb2: Move cache synchronisation from buffer done to dqbuf handler Sakari Ailus
2017-04-13 7:57 ` [RFC v3 04/14] v4l: Unify cache management hint buffer flags Sakari Ailus
2017-04-13 7:57 ` [RFC v3 05/14] vb2: Anticipate queue specific DMA attributes for USERPTR buffers Sakari Ailus
2017-04-13 15:09 ` Sakari Ailus [this message]
2017-04-13 7:57 ` [RFC v3 06/14] vb2: dma-contig: Assign DMA attrs for a buffer unconditionally Sakari Ailus
2017-04-13 7:57 ` [RFC v3 07/14] vb2: dma-contig: Remove redundant sgt_base field Sakari Ailus
2017-04-13 7:57 ` [RFC v3 08/14] vb2: dma-contig: Don't warn on failure in obtaining scatterlist Sakari Ailus
2017-04-13 7:57 ` [RFC v3 09/14] vb2: dma-contig: Move vb2_dc_get_base_sgt() up Sakari Ailus
2017-04-13 7:57 ` [RFC v3 10/14] vb2: dma-contig: Fix DMA attribute and cache management Sakari Ailus
2017-04-13 7:57 ` [RFC v3 11/14] vb2: dma-contig: Add WARN_ON_ONCE() to check for potential bugs Sakari Ailus
2017-04-13 7:57 ` [RFC v3 12/14] vb2: dma-sg: Let drivers decide DMA attrs of MMAP and USERPTR bufs Sakari Ailus
2017-04-13 7:57 ` [RFC v3 13/14] vb2: Don't sync cache for a buffer if so requested Sakari Ailus
2017-04-13 7:57 ` [RFC v3 14/14] vb2: Improve struct vb2_mem_ops documentation; alloc and put are for MMAP Sakari Ailus
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=1492096161-18018-1-git-send-email-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=hverkuil@xs4all.nl \
--cc=kyungmin.park@samsung.com \
--cc=labbott@redhat.com \
--cc=linux-media@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=posciak@chromium.org \
--cc=robdclark@gmail.com \
--cc=sumit.semwal@linaro.org \
/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