From: Federico Vaga <federico.vaga@gmail.com>
To: Mauro Carvalho Chehab <mchehab@redhat.com>,
Pawel Osciak <pawel@osciak.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Hans Verkuil <hans.verkuil@cisco.com>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>,
Giancarlo Asnaghi <giancarlo.asnaghi@st.com>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
Jonathan Corbet <corbet@lwn.net>,
Federico Vaga <federico.vaga@gmail.com>
Subject: [PATCH v4 1/3] videobuf2-dma-contig: user can specify GFP flags
Date: Sun, 6 Jan 2013 18:29:01 +0100 [thread overview]
Message-ID: <1357493343-13090-1-git-send-email-federico.vaga@gmail.com> (raw)
This is useful when you need to specify specific GFP flags during memory
allocation (e.g. GFP_DMA).
Signed-off-by: Federico Vaga <federico.vaga@gmail.com>
---
drivers/media/v4l2-core/videobuf2-dma-contig.c | 7 ++-----
include/media/videobuf2-dma-contig.h | 5 +++++
2 file modificati, 7 inserzioni(+), 5 rimozioni(-)
diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
index 10beaee..bb411c0 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
@@ -21,10 +21,6 @@
#include <media/videobuf2-dma-contig.h>
#include <media/videobuf2-memops.h>
-struct vb2_dc_conf {
- struct device *dev;
-};
-
struct vb2_dc_buf {
struct device *dev;
void *vaddr;
@@ -165,7 +161,8 @@ static void *vb2_dc_alloc(void *alloc_ctx, unsigned long size)
/* align image size to PAGE_SIZE */
size = PAGE_ALIGN(size);
- buf->vaddr = dma_alloc_coherent(dev, size, &buf->dma_addr, GFP_KERNEL);
+ buf->vaddr = dma_alloc_coherent(dev, size, &buf->dma_addr,
+ GFP_KERNEL | conf->mem_flags);
if (!buf->vaddr) {
dev_err(dev, "dma_alloc_coherent of size %ld failed\n", size);
kfree(buf);
diff --git a/include/media/videobuf2-dma-contig.h b/include/media/videobuf2-dma-contig.h
index 8197f87..22733f4 100644
--- a/include/media/videobuf2-dma-contig.h
+++ b/include/media/videobuf2-dma-contig.h
@@ -16,6 +16,11 @@
#include <media/videobuf2-core.h>
#include <linux/dma-mapping.h>
+struct vb2_dc_conf {
+ struct device *dev;
+ gfp_t mem_flags;
+};
+
static inline dma_addr_t
vb2_dma_contig_plane_dma_addr(struct vb2_buffer *vb, unsigned int plane_no)
{
--
1.7.11.7
next reply other threads:[~2013-01-06 17:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-06 17:29 Federico Vaga [this message]
2013-01-06 17:29 ` [PATCH V4 2/3] sta2x11_vip: convert to videobuf2 and control framework Federico Vaga
2013-01-07 9:46 ` Hans Verkuil
2013-01-06 17:29 ` [PATCH V4 3/3] adv7180: remove {query/g_/s_}ctrl Federico Vaga
2013-01-08 6:53 ` [PATCH v4 1/3] videobuf2-dma-contig: user can specify GFP flags Marek Szyprowski
2013-01-08 10:15 ` Federico Vaga
2013-01-08 10:40 ` Marek Szyprowski
2013-01-08 14:58 ` Federico Vaga
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=1357493343-13090-1-git-send-email-federico.vaga@gmail.com \
--to=federico.vaga@gmail.com \
--cc=corbet@lwn.net \
--cc=giancarlo.asnaghi@st.com \
--cc=hans.verkuil@cisco.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=mchehab@infradead.org \
--cc=mchehab@redhat.com \
--cc=pawel@osciak.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
all inboxes | Powered by JetHome®