From: "Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>
To: Helen Koike <helen.koike@collabora.com>,
Hans Verkuil <hverkuil@xs4all.nl>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
linux-media@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org,
"Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>
Subject: [PATCH v3 5/5] staging/intel-ipu3: Make use of V4L2_CAP_IO_MC
Date: Mon, 13 Jan 2020 00:24:58 +0100 [thread overview]
Message-ID: <20200112232458.2844506-6-niklas.soderlund+renesas@ragnatech.se> (raw)
In-Reply-To: <20200112232458.2844506-1-niklas.soderlund+renesas@ragnatech.se>
Set the V4L2_CAP_IO_MC capability flag and remove the driver specific
enum input and output callbacks.
Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
---
drivers/staging/media/ipu3/ipu3-v4l2.c | 30 ++------------------------
1 file changed, 2 insertions(+), 28 deletions(-)
diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c b/drivers/staging/media/ipu3/ipu3-v4l2.c
index 2f6b5bee39898715..e2f48f4c61245309 100644
--- a/drivers/staging/media/ipu3/ipu3-v4l2.c
+++ b/drivers/staging/media/ipu3/ipu3-v4l2.c
@@ -843,28 +843,6 @@ static int imgu_vidioc_g_meta_fmt(struct file *file, void *fh,
return 0;
}
-static int imgu_vidioc_enum_input(struct file *file, void *fh,
- struct v4l2_input *input)
-{
- if (input->index > 0)
- return -EINVAL;
- strscpy(input->name, "camera", sizeof(input->name));
- input->type = V4L2_INPUT_TYPE_CAMERA;
-
- return 0;
-}
-
-static int imgu_vidioc_enum_output(struct file *file, void *fh,
- struct v4l2_output *output)
-{
- if (output->index > 0)
- return -EINVAL;
- strscpy(output->name, "camera", sizeof(output->name));
- output->type = V4L2_INPUT_TYPE_CAMERA;
-
- return 0;
-}
-
/******************** function pointers ********************/
static struct v4l2_subdev_internal_ops imgu_subdev_internal_ops = {
@@ -931,10 +909,6 @@ static const struct v4l2_ioctl_ops imgu_v4l2_ioctl_ops = {
.vidioc_s_fmt_vid_out_mplane = imgu_vidioc_s_fmt,
.vidioc_try_fmt_vid_out_mplane = imgu_vidioc_try_fmt,
- .vidioc_enum_output = imgu_vidioc_enum_output,
-
- .vidioc_enum_input = imgu_vidioc_enum_input,
-
/* buffer queue management */
.vidioc_reqbufs = vb2_ioctl_reqbufs,
.vidioc_create_bufs = vb2_ioctl_create_bufs,
@@ -986,7 +960,7 @@ static void imgu_node_to_v4l2(u32 node, struct video_device *vdev,
switch (node) {
case IMGU_NODE_IN:
- cap = V4L2_CAP_VIDEO_OUTPUT_MPLANE;
+ cap = V4L2_CAP_VIDEO_OUTPUT_MPLANE | V4L2_CAP_IO_MC;
f->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
vdev->ioctl_ops = &imgu_v4l2_ioctl_ops;
break;
@@ -1005,7 +979,7 @@ static void imgu_node_to_v4l2(u32 node, struct video_device *vdev,
imgu_css_meta_fmt_set(&f->fmt.meta);
break;
default:
- cap = V4L2_CAP_VIDEO_CAPTURE_MPLANE;
+ cap = V4L2_CAP_VIDEO_CAPTURE_MPLANE | V4L2_CAP_IO_MC;
f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
vdev->ioctl_ops = &imgu_v4l2_ioctl_ops;
}
--
2.24.1
prev parent reply other threads:[~2020-01-12 23:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-12 23:24 [PATCH v3 0/5] v4l2-dev/ioctl: Add V4L2_CAP_IO_MC Niklas Söderlund
2020-01-12 23:24 ` [PATCH v3 1/5] " Niklas Söderlund
2020-01-13 12:09 ` Sakari Ailus
2020-02-14 13:14 ` Hans Verkuil
2020-01-22 21:50 ` Helen Koike
2020-02-14 13:25 ` Hans Verkuil
2020-02-14 14:06 ` Helen Koike
2020-02-14 13:29 ` Hans Verkuil
2020-01-12 23:24 ` [PATCH v3 2/5] rcar-vin: Use default VIDIOC_{G,S}_{INPUT,OUTPUT} handler Niklas Söderlund
2020-01-12 23:24 ` [PATCH v3 3/5] staging/intel-ipu3: " Niklas Söderlund
2020-01-12 23:24 ` [PATCH v3 4/5] rcar-vin: Make use of V4L2_CAP_IO_MC Niklas Söderlund
2020-01-12 23:24 ` Niklas Söderlund [this message]
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=20200112232458.2844506-6-niklas.soderlund+renesas@ragnatech.se \
--to=niklas.soderlund+renesas@ragnatech.se \
--cc=helen.koike@collabora.com \
--cc=hverkuil@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=sakari.ailus@linux.intel.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;
as well as URLs for NNTP newsgroup(s).