From: "André Almeida" <andrealmeid@collabora.com>
To: linux-media@vger.kernel.org
Cc: mchehab@kernel.org, hverkuil@xs4all.nl,
helen.koike@collabora.com, lucmaga@gmail.com,
linux-kernel@vger.kernel.org, kernel@collabora.com,
lkcamp@lists.libreplanetbr.org
Subject: [PATCH v2 15/15] media: vimc: Create multiplanar parameter
Date: Wed, 27 Mar 2019 12:17:43 -0300 [thread overview]
Message-ID: <20190327151743.18528-16-andrealmeid@collabora.com> (raw)
In-Reply-To: <20190327151743.18528-1-andrealmeid@collabora.com>
Create multiplanar kernel module parameter to define if the driver is
running in single planar or in multiplanar mode. Define the device
capabilities according to the multiplanar kernel parameter. A device can't
support both CAP_VIDEO_CAPTURE and CAP_VIDEO_CAPTURE_MPLANAR at the
same time.
Signed-off-by: André Almeida <andrealmeid@collabora.com>
---
Change in v2:
- Squash commits to create multiplanar module parameter and to define
the device capabilities
- Move the creation of the multiplanar parameter to the end of
history, so it's only added when all required changes are applied
drivers/media/platform/vimc/vimc-capture.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/vimc/vimc-capture.c b/drivers/media/platform/vimc/vimc-capture.c
index f5bfb36a145c..3666fcca6812 100644
--- a/drivers/media/platform/vimc/vimc-capture.c
+++ b/drivers/media/platform/vimc/vimc-capture.c
@@ -28,6 +28,10 @@
#define VIMC_CAP_DRV_NAME "vimc-capture"
+static unsigned int multiplanar;
+module_param(multiplanar, uint, 0000);
+MODULE_PARM_DESC(multiplanar, "0 (default) creates a single planar device, 1 creates a multiplanar device.");
+
/* Checks if the device supports multiplanar capture */
#define IS_MULTIPLANAR(vcap) \
(vcap->vdev.device_caps & V4L2_CAP_VIDEO_CAPTURE_MPLANE)
@@ -681,7 +685,9 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master,
/* Initialize the vb2 queue */
q = &vcap->queue;
- q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+ q->type = multiplanar ?
+ V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE :
+ V4L2_BUF_TYPE_VIDEO_CAPTURE;
q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
q->drv_priv = vcap;
q->buf_struct_size = sizeof(struct vimc_cap_buffer);
@@ -709,9 +715,12 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master,
dev_set_drvdata(comp, &vcap->ved);
vcap->dev = comp;
+
/* Initialize the video_device struct */
vdev = &vcap->vdev;
- vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+ vdev->device_caps = (multiplanar ?
+ V4L2_CAP_VIDEO_CAPTURE_MPLANE :
+ V4L2_BUF_TYPE_VIDEO_CAPTURE) | V4L2_CAP_STREAMING;
vdev->entity.ops = &vimc_cap_mops;
vdev->release = vimc_cap_release;
vdev->fops = &vimc_cap_fops;
--
2.21.0
next prev parent reply other threads:[~2019-03-27 15:19 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-27 15:17 [PATCH v2 00/15] media: vimc: Add support for multiplanar formats André Almeida
2019-03-27 15:17 ` [PATCH v2 01/15] media: Move sp2mp functions to v4l2-common André Almeida
2019-04-12 22:48 ` Helen Koike
2019-03-27 15:17 ` [PATCH v2 02/15] media: vimc: Remove unnecessary stream checks André Almeida
2019-04-12 22:48 ` Helen Koike
2019-03-27 15:17 ` [PATCH v2 03/15] media: vimc: cap: Change vimc_cap_device.format type André Almeida
2019-04-12 22:48 ` Helen Koike
2019-03-27 15:17 ` [PATCH v2 04/15] media: vimc: cap: Dynamically define stream pixelformat André Almeida
2019-04-12 22:48 ` Helen Koike
2019-03-27 15:17 ` [PATCH v2 05/15] media: vimc: cap: Add handler for singleplanar fmt ioctls André Almeida
2019-04-12 22:48 ` Helen Koike
2019-03-27 15:17 ` [PATCH v2 06/15] media: vimc: cap: Add handler for multiplanar " André Almeida
2019-03-27 15:17 ` [PATCH v2 07/15] media: vimc: cap: Add multiplanar formats André Almeida
2019-04-12 22:49 ` Helen Koike
2019-03-27 15:17 ` [PATCH v2 08/15] media: vimc: cap: Add multiplanar default format André Almeida
2019-04-12 22:49 ` Helen Koike
2019-03-27 15:17 ` [PATCH v2 09/15] media: vimc: cap: Allocate and verify mplanar buffers André Almeida
2019-04-12 22:49 ` Helen Koike
2019-03-27 15:17 ` [PATCH v2 10/15] media: vimc: Propagate multiplanar state in the stream André Almeida
2019-04-12 22:50 ` Helen Koike
2019-03-27 15:17 ` [PATCH v2 11/15] media: vimc: Add and use new struct vimc_frame André Almeida
2019-04-16 15:17 ` Helen Koike
2019-03-27 15:17 ` [PATCH v2 12/15] media: vimc: sen: Add support for multiplanar formats André Almeida
2019-03-27 15:17 ` [PATCH v2 13/15] media: vimc: sca: " André Almeida
2019-03-27 15:17 ` [PATCH v2 14/15] media: vimc: cap: " André Almeida
2019-03-27 15:17 ` André Almeida [this message]
2019-04-12 22:50 ` [PATCH v2 15/15] media: vimc: Create multiplanar parameter Helen Koike
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=20190327151743.18528-16-andrealmeid@collabora.com \
--to=andrealmeid@collabora.com \
--cc=helen.koike@collabora.com \
--cc=hverkuil@xs4all.nl \
--cc=kernel@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=lkcamp@lists.libreplanetbr.org \
--cc=lucmaga@gmail.com \
--cc=mchehab@kernel.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;
as well as URLs for NNTP newsgroup(s).