From patchwork Tue Jun 7 14:47:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Scheurer, Amber" X-Patchwork-Id: 857202 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p57ElurG001162 for ; Tue, 7 Jun 2011 14:47:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754882Ab1FGOry (ORCPT ); Tue, 7 Jun 2011 10:47:54 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:39893 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754845Ab1FGOrx (ORCPT ); Tue, 7 Jun 2011 10:47:53 -0400 Received: from dlep36.itg.ti.com ([157.170.170.91]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id p57Elr6f002443 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 7 Jun 2011 09:47:53 -0500 Received: from dlep26.itg.ti.com (smtp-le.itg.ti.com [157.170.170.27]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id p57ElrSA022463 for ; Tue, 7 Jun 2011 09:47:53 -0500 (CDT) Received: from dlee73.ent.ti.com (localhost [127.0.0.1]) by dlep26.itg.ti.com (8.13.8/8.13.8) with ESMTP id p57ElqjU025639; Tue, 7 Jun 2011 09:47:52 -0500 (CDT) Received: from dlelxv24.itg.ti.com (172.17.1.199) by DLEE73.ent.ti.com (157.170.170.88) with Microsoft SMTP Server id 8.3.106.1; Tue, 7 Jun 2011 09:47:52 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id p57ElqtN016029; Tue, 7 Jun 2011 09:47:52 -0500 Received: from localhost (a0393674u.apr.dhcp.ti.com [172.24.137.179]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id p57Elof22419; Tue, 7 Jun 2011 09:47:51 -0500 (CDT) From: Amber Jain To: CC: , , Amber Jain , Samreen Subject: [PATCH 3/6] V4L2: OMAP: VOUT: Adapt to Multiplanar APIs Date: Tue, 7 Jun 2011 20:17:35 +0530 Message-ID: <1307458058-29030-4-git-send-email-amber@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1307458058-29030-1-git-send-email-amber@ti.com> References: <1307458058-29030-1-git-send-email-amber@ti.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 07 Jun 2011 14:48:29 +0000 (UTC) Adapting the omap_vout driver for multiplanar API support. Signed-off-by: Amber Jain Signed-off-by: Samreen --- 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,