Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Ming Qian <ming.qian@nxp.com>
To:     mchehab@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de,
        mirela.rabulea@oss.nxp.com
Cc:     hverkuil-cisco@xs4all.nl, kernel@pengutronix.de,
        festevam@gmail.com, linux-imx@nxp.com, linux-media@vger.kernel.org,
        linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] media: imx-jpeg: Set V4L2_BUF_FLAG_LAST at eos
Date:   Thu, 10 Feb 2022 13:46:01 +0800
Message-Id: <20220210054601.5889-1-ming.qian@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+zrdZ0ow9SRSTPwy34n/dZd4VqSc7gZ2SC+IT8lx4JJUGS7y+dsnMxkpuJRS?=
 =?us-ascii?Q?JYeA5S5xN4VnuiYTxe0/+pUnT8xnVzrYZsd6+sO6a5JyG5ZgyLAA/TMhf4e8?=
 =?us-ascii?Q?/aXwOQR19Tor3rWZiZilHHUDsmRzdelWRL0V8smiB5NyFb/Dhvzht3+5MvpL?=
 =?us-ascii?Q?winJgeaDUzexbnfGG8F/plkZEA85iFYUEm7DqmeryylBBwYkuqJk4TxA4jrF?=
 =?us-ascii?Q?0B7OGBmH/0QY9G3s+H2iTc1EpHhFffwQ6W3Z+rKB8X+Ju9Rp+rqYCDvzvxhE?=
 =?us-ascii?Q?2XVai7xGQEpK0AsIx3pyOfucFdM2YVU+WM2XKlxGLoKkcUUkgIiBDdsxlbVK?=
 =?us-ascii?Q?pMamnQEzOQnnAeUDYxasYHVFvSdpc4hupeWxHJr3CWOk1dQR26BBDrHfsIlK?=
 =?us-ascii?Q?4maMs1kBEK+wjQ667FJX2+7Hdrw4UAbSqFldw6vPU43RWSaTUuBv9BcY/GDG?=
 =?us-ascii?Q?lstsAAp0GrEI/OjHi3q9Xi2tpWyusQBmalmNhtqaiNXnE3e1YlG5RE1/m9cP?=
 =?us-ascii?Q?Lxxa1h0sCya8wCAHnCWJZI22ZaPIhOEmuvENBewN2TG7nvjnDta6s/THx5kS?=
 =?us-ascii?Q?/dEhbOyYkJQzlGs4uhuLIi+rJWFxke/vkU5qUUb37V9D61AM6vHKXOux3VFp?=
 =?us-ascii?Q?oJfIWAK8oGDl0+8pnzMGQRVTdNoKIrtVpGB7SvHMg0EyTcH0YSgmOltROs4c?=
 =?us-ascii?Q?5NMibl8mlR0oX09DZGkBpMvZQIjXjbVZ48fQweBUO0AxFE8+f3LYpQ4zVh2p?=
 =?us-ascii?Q?yuZNHsYpyrzkwKFkqT6CG3kDvReWhG/PwAR+tlujX/QjwLBFeRMo7U0mBkBy?=
 =?us-ascii?Q?j7G21SX1M+xNdFsV6cUQnBSJZsN1m1Kigqu47ABnhgVC2CeBV+1y65GxAvlO?=
 =?us-ascii?Q?eszxmY/emj+TpEmJWjjNiCkah2dGQv2mwySQsNSC8jl29+mETWc0ob9Ga9rq?=
 =?us-ascii?Q?0BoBIEMsS5QWesOYy1e3SAV3VjPmO2EOFOpDlbTbTNUmlUSAP6I+Io5+UIZj?=
 =?us-ascii?Q?iIrwhRWTlpHR45q0XE3BAdS+8L8hKvifJeZDDMawFA4FqeTDTDinkZpO7FST?=
 =?us-ascii?Q?4t5M57Ym2OoQAjJRSN2DCnFaaFGYxyANSdkodJtgvgH5J+orgYLoXxF1MQSJ?=
 =?us-ascii?Q?Y77s5lRNL264TWpzMCUlyggLP8jV4J8TJ/SN4F7yTJuu1nvw8rh9SkXc5dFB?=
 =?us-ascii?Q?k1swsPIpM7Xu3Z6OwLpfd0F/v58KspXoDO6wS7c2EHXpT74MX1cuh74GfgVp?=
 =?us-ascii?Q?f2ixQOQLcBo+0EtviJqLaxukngxiD/BZX8XFbnmJOwEr9ag0v0tdN+2dzpiZ?=
 =?us-ascii?Q?64uSuzae5TfbaZMGkJlwIwHkZWVrmy9/dkevopkqaFPJOdTWpP6+fTba8QuJ?=
 =?us-ascii?Q?3v2s/R+3ztYrqQMbpbrZARAKzfg9BwK3Ii2XTwOdNXeHmhGdJepXUc+eF6yf?=
 =?us-ascii?Q?o5BydZh3ZGYdnM/Gxcbf+YmZ91ykPGhS5B+x3h3f+v/4SQgjDYsgny1w4pwq?=
 =?us-ascii?Q?MO+TuOVlOvhMbkv169MghSMJ3SdzXPLVRrcKazSsh6WaLp896cHghNOBhJ6H?=
 =?us-ascii?Q?N2JSPeaO1Wa2fxEoYWdTt4gNrAS96xnfmruwxOBz+6g8nnRumcojAkdy+SxE?=
 =?us-ascii?Q?E2gLi9MiG+IbzXO2bBVJTp8=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ac17e0ec-acd3-4942-ee84-08d9ec58ac9b
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 05:46:25.0094
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: hH6h6FdQUlBgLXAXHn1MRV8b6QGS7AlLv4Y6tzGBP8tOLOOP4Zkz5MBQ5bYRYM6qrkwNFn5ylBp8hpj5fuPrUg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0402MB3763
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The V4L2_EVENT_EOS event is a deprecated behavior,
the V4L2_BUF_FLAG_LAST buffer flag should be used instead.

Signed-off-by: Ming Qian <ming.qian@nxp.com>
Reviewed-by: Mirela Rabulea <mirela.rabulea@nxp.com>
---
 drivers/media/platform/imx-jpeg/mxc-jpeg.c | 39 ++++++++++++++++++++--
 drivers/media/platform/imx-jpeg/mxc-jpeg.h |  1 +
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/imx-jpeg/mxc-jpeg.c
index 86d37d14cfe2..3c50c572d6b0 100644
--- a/drivers/media/platform/imx-jpeg/mxc-jpeg.c
+++ b/drivers/media/platform/imx-jpeg/mxc-jpeg.c
@@ -991,6 +991,20 @@ static void mxc_jpeg_device_run(void *priv)
 	spin_unlock_irqrestore(&ctx->mxc_jpeg->hw_lock, flags);
 }
 
+static void mxc_jpeg_set_last_buffer_dequeued(struct mxc_jpeg_ctx *ctx)
+{
+	struct vb2_queue *q;
+
+	ctx->stopped = 1;
+	q = v4l2_m2m_get_dst_vq(ctx->fh.m2m_ctx);
+	if (!list_empty(&q->done_list))
+		return;
+
+	q->last_buffer_dequeued = true;
+	wake_up(&q->done_wq);
+	ctx->stopped = 0;
+}
+
 static int mxc_jpeg_decoder_cmd(struct file *file, void *priv,
 				struct v4l2_decoder_cmd *cmd)
 {
@@ -1008,6 +1022,7 @@ static int mxc_jpeg_decoder_cmd(struct file *file, void *priv,
 		if (v4l2_m2m_num_src_bufs_ready(fh->m2m_ctx) == 0) {
 			/* No more src bufs, notify app EOS */
 			notify_eos(ctx);
+			mxc_jpeg_set_last_buffer_dequeued(ctx);
 		} else {
 			/* will send EOS later*/
 			ctx->stopping = 1;
@@ -1034,6 +1049,7 @@ static int mxc_jpeg_encoder_cmd(struct file *file, void *priv,
 		if (v4l2_m2m_num_src_bufs_ready(fh->m2m_ctx) == 0) {
 			/* No more src bufs, notify app EOS */
 			notify_eos(ctx);
+			mxc_jpeg_set_last_buffer_dequeued(ctx);
 		} else {
 			/* will send EOS later*/
 			ctx->stopping = 1;
@@ -1110,6 +1126,8 @@ static void mxc_jpeg_stop_streaming(struct vb2_queue *q)
 		v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR);
 	}
 	pm_runtime_put_sync(&ctx->mxc_jpeg->pdev->dev);
+	ctx->stopping = 0;
+	ctx->stopped = 0;
 }
 
 static int mxc_jpeg_valid_comp_id(struct device *dev,
@@ -1401,12 +1419,29 @@ static int mxc_jpeg_buf_prepare(struct vb2_buffer *vb)
 	return 0;
 }
 
+static void mxc_jpeg_buf_finish(struct vb2_buffer *vb)
+{
+	struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+	struct mxc_jpeg_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
+	struct vb2_queue *q = vb->vb2_queue;
+
+	if (V4L2_TYPE_IS_OUTPUT(vb->type))
+		return;
+	if (!ctx->stopped)
+		return;
+	if (list_empty(&q->done_list)) {
+		vbuf->flags |= V4L2_BUF_FLAG_LAST;
+		ctx->stopped = 0;
+	}
+}
+
 static const struct vb2_ops mxc_jpeg_qops = {
 	.queue_setup		= mxc_jpeg_queue_setup,
 	.wait_prepare		= vb2_ops_wait_prepare,
 	.wait_finish		= vb2_ops_wait_finish,
 	.buf_out_validate	= mxc_jpeg_buf_out_validate,
 	.buf_prepare		= mxc_jpeg_buf_prepare,
+	.buf_finish             = mxc_jpeg_buf_finish,
 	.start_streaming	= mxc_jpeg_start_streaming,
 	.stop_streaming		= mxc_jpeg_stop_streaming,
 	.buf_queue		= mxc_jpeg_buf_queue,
@@ -1842,14 +1877,14 @@ static int mxc_jpeg_dqbuf(struct file *file, void *priv,
 	int ret;
 
 	dev_dbg(dev, "DQBUF type=%d, index=%d", buf->type, buf->index);
-	if (ctx->stopping == 1	&& num_src_ready == 0) {
+	if (ctx->stopping == 1 && num_src_ready == 0) {
 		/* No more src bufs, notify app EOS */
 		notify_eos(ctx);
 		ctx->stopping = 0;
+		mxc_jpeg_set_last_buffer_dequeued(ctx);
 	}
 
 	ret = v4l2_m2m_dqbuf(file, fh->m2m_ctx, buf);
-
 	return ret;
 }
 
diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg.h b/drivers/media/platform/imx-jpeg/mxc-jpeg.h
index 9fb2a5aaa941..f53f004ba851 100644
--- a/drivers/media/platform/imx-jpeg/mxc-jpeg.h
+++ b/drivers/media/platform/imx-jpeg/mxc-jpeg.h
@@ -91,6 +91,7 @@ struct mxc_jpeg_ctx {
 	struct v4l2_fh			fh;
 	enum mxc_jpeg_enc_state		enc_state;
 	unsigned int			stopping;
+	unsigned int			stopped;
 	unsigned int			slot;
 };
 
-- 
2.33.0