From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751511AbdBJHJg (ORCPT ); Fri, 10 Feb 2017 02:09:36 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:65476 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750990AbdBJHJc (ORCPT ); Fri, 10 Feb 2017 02:09:32 -0500 X-AuditID: cbfec7f1-f793f6d000007796-33-589d66d6e80c Subject: Re: [PATCH v2 4/4] [media] s5p-mfc: Always check and set 'v4l2_pix_format:field' field To: Thibault Saunier , linux-kernel@vger.kernel.org Cc: Mauro Carvalho Chehab , Andi Shyti , Shuah Khan , Inki Dae , Nicolas Dufresne , Javier Martinez Canillas , Mauro Carvalho Chehab , Marek Szyprowski , Kukjin Kim , linux-samsung-soc@vger.kernel.org, Sylwester Nawrocki , linux-media@vger.kernel.org, Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, Ulf Hansson From: Andrzej Hajda Message-id: <828ec5c5-fddd-f3d1-264e-41adb2d8a69f@samsung.com> Date: Fri, 10 Feb 2017 08:08:04 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-version: 1.0 In-reply-to: <20170209200420.3046-5-thibault.saunier@osg.samsung.com> Content-type: text/plain; charset=windows-1252 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA01Sa0hTYRjm27lutDgeNV8qC0b9SMhL+eMrSwoKTmBXIiUQO+hRI2/tpLUw NCjL68zKzC5ILYmlzTZTEZGa2szSeamZkAsSRqSWptjFtFzHwH/P+z7P873v8/KxBN9DrWSP p52S9Gliio7WkA0vfvZsdCXeiQktnAvEje0eCpd9KCXx2HiNChtHRgnsdNYx2DriovBA820a F9U9pXCFs1WFa9uHGVxt/a3CH0wncfO0m8ZtY5cofH16gsRTz8oI7KiN3uEjNA2bkGA159PC e1cLLdhMOUK9cZgRrN+GKaGk3oyEKeuaA+xRzbYEKeV4lqQPiTymSb5VVkdkdK44M1tTgHLR A74AsSxw4dB/y78AqRfgCuh1W+gCpGF57gGCiZ56QimmEDicTpWiCofHH58sEtUI7CYHUgoP gp5GN+N91pcTYbzU4DX4cdEwM3iR9GoI7gsJxU2ThJeguQ0wZxuivVjLRcKbRybS6yW59fDn /H5v25+LgaZ3RYsSH/hx1f1PouZ2w0NLnLdNcKFQca1NpeC1YKsZ/7cbcPksdNxtIZWUgWB9 Rij774LZahutYF/47KhnFLwaBq4Wkoq3EME3YyejFNcQzE9ULLojoM3RRynTlkNZww1CGaCF y3m8IhGguDuPVPBO+DTXvnisAQQzVd+ZUrS2ckmeyiUhKpeEqEKEGflJmXJqkiRvCpbFVDkz LSk4Pj3VihZ+2at5x2QT+tq51Y44FumWaT9l347hKTFLNqTaEbCEzk9rSbgTw2sTRMNZSZ8e p89MkWQ7WsWSugBtS9WbaJ5LEk9JJyQpQ9L/Z1WsemUu6phwraqTwkNCrlA4qL8rIDZiJpF5 HsVPMqNhL8u3//rRd3da1gStU1Wp+7pvenoPd+Xue+gccjqyL5sO32/TjWcFHNLcsHAHzN89 Q6cv+CSIWatL9oaRoYy9q/uspnxwT/LbwdfxOzZfb71nKIod3FI+f7DonLH2iOVMdpQrR60j 5WQxLIjQy+JfeB6Cm2EDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDIsWRmVeSWpSXmKPExsVy+t/xq7o30uZGGNxYy22x/cgzVotJ9yew WLx5u4bJov/xa2aL8+c3sFtsenyN1eLyrjlsFj0btrJazDi/j8li7ZG77BbLNv1hsri/pNBi 15d7bBaH37SzWkz98oHF4vOBScwWx9eGOwh67Li7hNFj06pONo871/aweWxeUu+xpf8uu8em T3dZPfq2rGL0+LxJLoAjys0mIzUxJbVIITUvOT8lMy/dVik0xE3XQkkhLzE31VYpQtc3JEhJ oSwxpxTIMzJAAw7OAe7BSvp2CW4ZsydtYC44IVbxe00XYwPjUqEuRk4OCQETiXWPNjJD2GIS F+6tZ+ti5OIQEljCKNF+eyMLhPOMUeLly+dAVRwcwgKJEm8nVII0iAiESxy71wjVcJlR4t6z p6wgDrPAJxaJya297CBVbAKaEn8332QDsXkF7CSurF7CAjKIRUBV4n+jP0hYVCBCYv7TVUwQ JYISPybfAyvhFHCVWLE+HsRkFtCTuH9RC6SCWUBeYvOat8wTGAVmIWmYhVA1C0nVAkbmVYwi qaXFuem5xUZ6xYm5xaV56XrJ+bmbGIExve3Yzy07GLveBR9iFOBgVOLhnVA1J0KINbGsuDL3 EKMEB7OSCO/6lLkRQrwpiZVVqUX58UWlOanFhxhNgR6YyCwlmpwPTDd5JfGGJobmloZGxhYW 5kZGSuK8Uz9cCRcSSE8sSc1OTS1ILYLpY+LglGpg9Fp/fGaRXqe75aF73RtrL/wK+SLc7dXw //63J3t3X/53VNhJ9k+JKl/ZnrKt9pHvNRdHn37269vjhbNmpi+4eYY3qTXrwep7TGwxlgsq ph5RON+lub/S4+Sx07tXKPy2eP/H9uvXZv22vx7avJIJ6+c/Cjq67WV6EGNJcMWyK0I3MlYJ zArfmKTEUpyRaKjFXFScCAA+ylun/wIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170210070806eucas1p1d05945675c7717d9a1e27bf3cb277f7b X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 X-Local-Sender: =?UTF-8?B?QW5kcnplaiBIYWpkYRtTUlBPTC1LZXJuZWwgKFRQKRvsgrw=?= =?UTF-8?B?7ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?QW5kcnplaiBIYWpkYRtTUlBPTC1LZXJuZWwgKFRQKRtTYW1z?= =?UTF-8?B?dW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170209200606epcas2p2ba463850690a45b526b7b6d496545039 X-RootMTR: 20170209200606epcas2p2ba463850690a45b526b7b6d496545039 References: <20170209200420.3046-1-thibault.saunier@osg.samsung.com> <20170209200420.3046-5-thibault.saunier@osg.samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09.02.2017 21:04, Thibault Saunier wrote: > It is required by the standard that the field order is set by the > driver. > > Signed-off-by: Thibault Saunier > --- > drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 23 +++++++++++++++++++++-- > 1 file changed, 21 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c > index 960d6c7052bd..309b0a1bbca5 100644 > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c > @@ -345,7 +345,6 @@ static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f) > rectangle. */ > pix_mp->width = ctx->buf_width; > pix_mp->height = ctx->buf_height; > - pix_mp->field = V4L2_FIELD_NONE; > pix_mp->num_planes = 2; > /* Set pixelformat to the format in which MFC > outputs the decoded frame */ > @@ -369,7 +368,6 @@ static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f) > so width and height have no meaning */ > pix_mp->width = 0; > pix_mp->height = 0; > - pix_mp->field = V4L2_FIELD_NONE; > pix_mp->plane_fmt[0].bytesperline = ctx->dec_src_buf_size; > pix_mp->plane_fmt[0].sizeimage = ctx->dec_src_buf_size; > pix_mp->pixelformat = ctx->src_fmt->fourcc; > @@ -379,6 +377,14 @@ static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f) > mfc_debug(2, "%s-- with error\n", __func__); > return -EINVAL; > } > + > + if (pix_mp->field == V4L2_FIELD_ANY) { > + pix_mp->field = V4L2_FIELD_NONE; > + } else if (pix_mp->field != V4L2_FIELD_NONE) { > + mfc_err("Not supported field order(%d)\n", pix_mp->field); > + return -EINVAL; > + } > + Again in g_fmt you should not check current value of the field. > mfc_debug_leave(); > return 0; > } > @@ -389,6 +395,19 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f) > struct s5p_mfc_dev *dev = video_drvdata(file); > struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp; > struct s5p_mfc_fmt *fmt; > + enum v4l2_field field; > + > + field = f->fmt.pix.field; > + if (field == V4L2_FIELD_ANY) { > + field = V4L2_FIELD_NONE; > + } else if (V4L2_FIELD_NONE != field) { > + mfc_debug(2, "Not supported field order(%d)\n", pix_mp->field); > + return -EINVAL; > + } > + > + /* V4L2 specification suggests the driver corrects the format struct > + * if any of the dimensions is unsupported */ > + f->fmt.pix.field = field; According to docs [1], you should just adjust the field. [1]: http://hverkuil.home.xs4all.nl/spec/uapi/v4l/vidioc-g-fmt.html?highlight=g_fmt#c.VIDIOC_G_FMT Regards Andrzej > > mfc_debug(2, "Type is %d\n", f->type); > if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {