diff mbox

[3/6] V4L2: OMAP: VOUT: Adapt to Multiplanar APIs

Message ID 1307458058-29030-4-git-send-email-amber@ti.com (mailing list archive)
State RFC
Headers show

Commit Message

Scheurer, Amber June 7, 2011, 2:47 p.m. UTC 
Adapting the omap_vout driver for multiplanar API support.

Signed-off-by: Amber Jain <amber@ti.com>
Signed-off-by: Samreen <samreen@ti.com>
---
 drivers/media/video/omap/omap_vout.c |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

Comments

Vaibhav Hiremath July 5, 2011, 7:16 p.m. UTC | #1 
> -----Original Message-----
> From: JAIN, AMBER
> Sent: Tuesday, June 07, 2011 8:18 PM
> To: linux-media@vger.kernel.org
> Cc: Hiremath, Vaibhav; Semwal, Sumit; JAIN, AMBER; Nilofer, Samreen
> Subject: [PATCH 3/6] V4L2: OMAP: VOUT: Adapt to Multiplanar APIs
> 
> Adapting the omap_vout driver for multiplanar API support.
> 
[Hiremath, Vaibhav] Personally I think it doesn't make sense to change function names only without adding functionality.

So I would suggest merging this patch with the actual multi-planar format support patch, which I believe is not part of this series.

Irrespective of this, can you create separate patch series for,

  V4L2: OMAP: VOUT: isr handling extended for DPI and HDMI interface
  V4L2: OMAP: VOUT: dma map and unmap v4l2 buffers in qbuf and dqbuf
  V4l2: OMAP: VOUT: Minor Cleanup, removing the unnecessary code.

Thanks,
Vaibhav

> Signed-off-by: Amber Jain <amber@ti.com>
> Signed-off-by: Samreen <samreen@ti.com>
> ---
>  drivers/media/video/omap/omap_vout.c |   19 ++++++++++---------
>  1 files changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/media/video/omap/omap_vout.c
> b/drivers/media/video/omap/omap_vout.c
> index 435fe65..70fb45e 100644
> --- a/drivers/media/video/omap/omap_vout.c
> +++ b/drivers/media/video/omap/omap_vout.c
> @@ -1014,12 +1014,13 @@ static int vidioc_querycap(struct file *file, void
> *fh,
>  	strlcpy(cap->driver, VOUT_NAME, sizeof(cap->driver));
>  	strlcpy(cap->card, vout->vfd->name, sizeof(cap->card));
>  	cap->bus_info[0] = '\0';
> -	cap->capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT;
> +	cap->capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT |
> +				V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
> 
>  	return 0;
>  }
> 
> -static int vidioc_enum_fmt_vid_out(struct file *file, void *fh,
> +static int vidioc_enum_fmt_vid_out_mplane(struct file *file, void *fh,
>  			struct v4l2_fmtdesc *fmt)
>  {
>  	int index = fmt->index;
> @@ -1038,7 +1039,7 @@ static int vidioc_enum_fmt_vid_out(struct file *file,
> void *fh,
>  	return 0;
>  }
> 
> -static int vidioc_g_fmt_vid_out(struct file *file, void *fh,
> +static int vidioc_g_fmt_vid_out_mplane(struct file *file, void *fh,
>  			struct v4l2_format *f)
>  {
>  	struct omap_vout_device *vout = fh;
> @@ -1048,7 +1049,7 @@ static int vidioc_g_fmt_vid_out(struct file *file,
> void *fh,
> 
>  }
> 
> -static int vidioc_try_fmt_vid_out(struct file *file, void *fh,
> +static int vidioc_try_fmt_vid_out_mplane(struct file *file, void *fh,
>  			struct v4l2_format *f)
>  {
>  	struct omap_overlay *ovl;
> @@ -1071,7 +1072,7 @@ static int vidioc_try_fmt_vid_out(struct file *file,
> void *fh,
>  	return 0;
>  }
> 
> -static int vidioc_s_fmt_vid_out(struct file *file, void *fh,
> +static int vidioc_s_fmt_vid_out_mplane(struct file *file, void *fh,
>  			struct v4l2_format *f)
>  {
>  	int ret, bpp;
> @@ -1817,10 +1818,10 @@ static int vidioc_g_fbuf(struct file *file, void
> *fh,
> 
>  static const struct v4l2_ioctl_ops vout_ioctl_ops = {
>  	.vidioc_querycap      			= vidioc_querycap,
> -	.vidioc_enum_fmt_vid_out 		= vidioc_enum_fmt_vid_out,
> -	.vidioc_g_fmt_vid_out			= vidioc_g_fmt_vid_out,
> -	.vidioc_try_fmt_vid_out			= vidioc_try_fmt_vid_out,
> -	.vidioc_s_fmt_vid_out			= vidioc_s_fmt_vid_out,
> +	.vidioc_enum_fmt_vid_out_mplane		=
> vidioc_enum_fmt_vid_out_mplane,
> +	.vidioc_g_fmt_vid_out_mplane		= vidioc_g_fmt_vid_out_mplane,
> +	.vidioc_try_fmt_vid_out_mplane		=
> vidioc_try_fmt_vid_out_mplane,
> +	.vidioc_s_fmt_vid_out_mplane		= vidioc_s_fmt_vid_out_mplane,
>  	.vidioc_queryctrl    			= vidioc_queryctrl,
>  	.vidioc_g_ctrl       			= vidioc_g_ctrl,
>  	.vidioc_s_fbuf				= vidioc_s_fbuf,
> --
> 1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
index 435fe65..70fb45e 100644
--- a/drivers/media/video/omap/omap_vout.c
+++ b/drivers/media/video/omap/omap_vout.c
@@ -1014,12 +1014,13 @@  static int vidioc_querycap(struct file *file, void *fh,
 	strlcpy(cap->driver, VOUT_NAME, sizeof(cap->driver));
 	strlcpy(cap->card, vout->vfd->name, sizeof(cap->card));
 	cap->bus_info[0] = '\0';
-	cap->capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT;
+	cap->capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT |
+				V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
 
 	return 0;
 }
 
-static int vidioc_enum_fmt_vid_out(struct file *file, void *fh,
+static int vidioc_enum_fmt_vid_out_mplane(struct file *file, void *fh,
 			struct v4l2_fmtdesc *fmt)
 {
 	int index = fmt->index;
@@ -1038,7 +1039,7 @@  static int vidioc_enum_fmt_vid_out(struct file *file, void *fh,
 	return 0;
 }
 
-static int vidioc_g_fmt_vid_out(struct file *file, void *fh,
+static int vidioc_g_fmt_vid_out_mplane(struct file *file, void *fh,
 			struct v4l2_format *f)
 {
 	struct omap_vout_device *vout = fh;
@@ -1048,7 +1049,7 @@  static int vidioc_g_fmt_vid_out(struct file *file, void *fh,
 
 }
 
-static int vidioc_try_fmt_vid_out(struct file *file, void *fh,
+static int vidioc_try_fmt_vid_out_mplane(struct file *file, void *fh,
 			struct v4l2_format *f)
 {
 	struct omap_overlay *ovl;
@@ -1071,7 +1072,7 @@  static int vidioc_try_fmt_vid_out(struct file *file, void *fh,
 	return 0;
 }
 
-static int vidioc_s_fmt_vid_out(struct file *file, void *fh,
+static int vidioc_s_fmt_vid_out_mplane(struct file *file, void *fh,
 			struct v4l2_format *f)
 {
 	int ret, bpp;
@@ -1817,10 +1818,10 @@  static int vidioc_g_fbuf(struct file *file, void *fh,
 
 static const struct v4l2_ioctl_ops vout_ioctl_ops = {
 	.vidioc_querycap      			= vidioc_querycap,
-	.vidioc_enum_fmt_vid_out 		= vidioc_enum_fmt_vid_out,
-	.vidioc_g_fmt_vid_out			= vidioc_g_fmt_vid_out,
-	.vidioc_try_fmt_vid_out			= vidioc_try_fmt_vid_out,
-	.vidioc_s_fmt_vid_out			= vidioc_s_fmt_vid_out,
+	.vidioc_enum_fmt_vid_out_mplane		= vidioc_enum_fmt_vid_out_mplane,
+	.vidioc_g_fmt_vid_out_mplane		= vidioc_g_fmt_vid_out_mplane,
+	.vidioc_try_fmt_vid_out_mplane		= vidioc_try_fmt_vid_out_mplane,
+	.vidioc_s_fmt_vid_out_mplane		= vidioc_s_fmt_vid_out_mplane,
 	.vidioc_queryctrl    			= vidioc_queryctrl,
 	.vidioc_g_ctrl       			= vidioc_g_ctrl,
 	.vidioc_s_fbuf				= vidioc_s_fbuf,