From: Xia Jiang <xia.jiang@mediatek•com>
To: Hans Verkuil <hverkuil-cisco@xs4all•nl>,
Mauro Carvalho Chehab <mchehab+samsung@kernel•org>,
Rob Herring <robh+dt@kernel•org>,
"Matthias Brugger" <matthias.bgg@gmail•com>,
Rick Chang <rick.chang@mediatek•com>
Cc: Xia Jiang <xia.jiang@mediatek•com>,
devicetree@vger•kernel.org, srv_heupstream@mediatek•com,
linux-kernel@vger•kernel.org, Tomasz Figa <tfiga@chromium•org>,
linux-mediatek@lists•infradead.org, linux-media@vger•kernel.org,
linux-arm-kernel@lists•infradead.org,
Marek Szyprowski <m.szyprowski@samsung•com>
Subject: [PATCH v4 4/5] media: platform: Fix v4l2-compliance test bug
Date: Thu, 17 Oct 2019 16:40:36 +0800 [thread overview]
Message-ID: <20191017084033.28299-5-xia.jiang@mediatek.com> (raw)
In-Reply-To: <20191017084033.28299-1-xia.jiang@mediatek.com>
Improve subscribe event handling: let v4l2_ctrl_subscribe_event() do the
job for other types except V4L2_EVENT_SOURCE_CHANGE.
Add checking created buffer size follow in mtk_jpeg_queue_setup().
Signed-off-by: Xia Jiang <xia.jiang@mediatek•com>
---
v4: new add patch for v4l2-compliance test bug fix
---
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
index 5f0990fce8ef..abc506a552c1 100644
--- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
+++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
@@ -446,9 +446,9 @@ static int mtk_jpeg_subscribe_event(struct v4l2_fh *fh,
switch (sub->type) {
case V4L2_EVENT_SOURCE_CHANGE:
return v4l2_src_change_event_subscribe(fh, sub);
- default:
- return -EINVAL;
}
+
+ return v4l2_ctrl_subscribe_event(fh, sub);
}
static int mtk_jpeg_g_selection(struct file *file, void *priv,
@@ -571,6 +571,13 @@ static int mtk_jpeg_queue_setup(struct vb2_queue *q,
if (!q_data)
return -EINVAL;
+ if (*num_planes) {
+ for (i = 0; i < *num_planes; i++)
+ if (sizes[i] < q_data->sizeimage[i])
+ return -EINVAL;
+ return 0;
+ }
+
*num_planes = q_data->fmt->colplanes;
for (i = 0; i < q_data->fmt->colplanes; i++) {
sizes[i] = q_data->sizeimage[i];
--
2.18.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-10-17 8:42 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-17 8:40 [PATCH v4 0/5] Add support for mt2701 JPEG ENC support Xia Jiang
2019-10-17 8:40 ` [PATCH v4 1/5] media: dt-bindings: Add jpeg enc device tree node document Xia Jiang
2019-10-17 8:40 ` [PATCH v4 2/5] arm: dts: Add jpeg enc device tree node Xia Jiang
2019-10-17 8:40 ` [PATCH v4 3/5] media: platform: Rename jpeg dec file name Xia Jiang
2019-10-17 8:40 ` Xia Jiang [this message]
2019-10-17 8:40 ` [PATCH v4 5/5] media: platform: Add jpeg dec/enc feature Xia Jiang
2019-10-21 9:23 ` Hans Verkuil
2019-12-06 8:06 ` Xia Jiang
2019-10-23 10:39 ` Tomasz Figa
2019-10-24 8:38 ` Xia Jiang
2019-10-24 9:23 ` Tomasz Figa
2019-10-28 2:25 ` Xia Jiang
2019-11-11 7:01 ` Tomasz Figa
2019-12-06 9:59 ` Xia Jiang
2020-03-10 4:17 ` Tomasz Figa
2020-04-22 7:00 ` Xia Jiang
2020-05-01 15:15 ` Tomasz Figa
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=20191017084033.28299-5-xia.jiang@mediatek.com \
--to=xia.jiang@mediatek$(echo .)com \
--cc=devicetree@vger$(echo .)kernel.org \
--cc=hverkuil-cisco@xs4all$(echo .)nl \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-media@vger$(echo .)kernel.org \
--cc=linux-mediatek@lists$(echo .)infradead.org \
--cc=m.szyprowski@samsung$(echo .)com \
--cc=matthias.bgg@gmail$(echo .)com \
--cc=mchehab+samsung@kernel$(echo .)org \
--cc=rick.chang@mediatek$(echo .)com \
--cc=robh+dt@kernel$(echo .)org \
--cc=srv_heupstream@mediatek$(echo .)com \
--cc=tfiga@chromium$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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