From patchwork Mon Sep 24 10:04:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sylwester Nawrocki/Kernel \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 1497021 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 34BA43FE80 for ; Mon, 24 Sep 2012 10:04:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752508Ab2IXKE0 (ORCPT ); Mon, 24 Sep 2012 06:04:26 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:59010 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751181Ab2IXKEZ (ORCPT ); Mon, 24 Sep 2012 06:04:25 -0400 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MAU00A4PMMETHX0@mailout4.samsung.com>; Mon, 24 Sep 2012 19:04:24 +0900 (KST) X-AuditID: cbfee61b-b7f2b6d000000f14-77-5060302843d1 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id E2.B7.03860.82030605; Mon, 24 Sep 2012 19:04:24 +0900 (KST) Received: from amdc248.digital.local ([106.116.147.32]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MAU004KUMN0WL50@mmp2.samsung.com>; Mon, 24 Sep 2012 19:04:24 +0900 (KST) From: Sylwester Nawrocki To: linux-media@vger.kernel.org Cc: t.stanislaws@samsung.com, hverkuil@xs4all.nl, kyungmin.park@samsung.com, sw0312.kim@samsung.com, linux-samsung-soc@vger.kernel.org, Sylwester Nawrocki Subject: [PATCH RFC] s5p-tv: Report only multi-plane capabilities in vidioc_querycap Date: Mon, 24 Sep 2012 12:04:09 +0200 Message-id: <1348481049-19145-1-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.11.3 In-reply-to: <201209211207.46679.hverkuil@xs4all.nl> References: <201209211207.46679.hverkuil@xs4all.nl> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrKJMWRmVeSWpSXmKPExsVy+t9jQV0Ng4QAg1cPJS16NmxltZhxfh+T A5PH501yAYxRXDYpqTmZZalF+nYJXBn/f2xhKZjOV7F7y1HWBsalPF2MnBwSAiYSf1ffZYGw xSQu3FvP1sXIxSEkMJ1RYsLUQ2wgCSGBdiaJP3vAbDYBQ4neo32MILaIgLzEk94bYA3MAtsZ JW4cvgmWEBYIkzj58RQziM0ioCpx8cdn1i5GDg5eATeJlX02EMsUJX58XwNWwgl0xOHbzWAl QgLGEjc3h05g5F3AyLCKUTS1ILmgOCk910ivODG3uDQvXS85P3cTI9jzz6R3MK5qsDjEKMDB qMTDu+FMfIAQa2JZcWXuIUYJDmYlEd6IZ0Ah3pTEyqrUovz4otKc1OJDjNIcLErivMKfAgOE BNITS1KzU1MLUotgskwcnFINjGVTGpYc8rulsTpsgsyie3PMw+fmR+WeydVT6q5afUdkq3Ln +gnvA240nDq65ryz6Vebd94HJzopZi+s8zAxX/lZ5+WXwx+7j5UpSUZ8XnZ/l9aSSW16Z8Nu m3nOvjNXz8J+4+efJoyHmBunfD5gUpQpmvdxzdRfM/Rz29abGyqpX3UO+b7Zs1mJpTgj0VCL uag4EQDwNZq1+AEAAA== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The mixer video node supports only multi-planar API so the driver should not be setting V4L2_CAP_VIDEO_OUTPUT flags. Fix this and also switch to device_caps. Additionally fix the VIDIOC_ENUM_FMT ioctl handler which now works for V4L2_BUF_TYPE_CAPTURE, rather than expected V4L2_BUF_TYPE_CAPTURE_MPLANE. Cc: Tomasz Stanislawski Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park --- drivers/media/platform/s5p-tv/mixer_video.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- 1.7.11.3 -- 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 --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c index 8649de01..9876bd9 100644 --- a/drivers/media/platform/s5p-tv/mixer_video.c +++ b/drivers/media/platform/s5p-tv/mixer_video.c @@ -164,9 +164,8 @@ static int mxr_querycap(struct file *file, void *priv, strlcpy(cap->driver, MXR_DRIVER_NAME, sizeof cap->driver); strlcpy(cap->card, layer->vfd.name, sizeof cap->card); sprintf(cap->bus_info, "%d", layer->idx); - cap->version = KERNEL_VERSION(0, 1, 0); - cap->capabilities = V4L2_CAP_STREAMING | - V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_VIDEO_OUTPUT_MPLANE; + cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT_MPLANE; + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; return 0; } @@ -727,7 +726,7 @@ static int mxr_streamoff(struct file *file, void *priv, enum v4l2_buf_type i) static const struct v4l2_ioctl_ops mxr_ioctl_ops = { .vidioc_querycap = mxr_querycap, /* format handling */ - .vidioc_enum_fmt_vid_out = mxr_enum_fmt, + .vidioc_enum_fmt_vid_out_mplane = mxr_enum_fmt, .vidioc_s_fmt_vid_out_mplane = mxr_s_fmt, .vidioc_g_fmt_vid_out_mplane = mxr_g_fmt, /* buffer control */