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, hverkuil-cisco@xs4all.nl
Cc:     shawnguo@kernel.org, robh+dt@kernel.org, s.hauer@pengutronix.de,
        kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com,
        xiahong.bao@nxp.com, eagle.zhou@nxp.com, tao.jiang_2@nxp.com,
        linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org
Subject: [PATCH] media: amphion: initiate a drain of the capture queue in dynamic resolution change
Date:   Sat,  6 May 2023 16:47:35 +0800
Message-Id: <20230506084735.30744-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?3NlkWqTjq7gc7VJFLAvBi/Eqlou3E6R+bPAgLwvUiv6MNWYFh57I81qNIeOR?=
 =?us-ascii?Q?zl8m2mE6/TvKBy8bfEup6o0i/LbdB7dnoGAiaJHcKQXXUhKrW1mzILsH6rd8?=
 =?us-ascii?Q?H9lsa3OQZDcANbY8aGkZnlHAqRp6WQHnyBy1dp0umzwBRJoEJqfTOY/sGTXK?=
 =?us-ascii?Q?H2huJh1qNnkEJ9v9aMcW733yreoppi/O3aroZBx/un2B56OXCfLGqkCKi/k8?=
 =?us-ascii?Q?ulFREhkKeB+dxcxCzFJvQqMGsPiSnYRii1FRMtjRhX8VSQrtLa8rIP8ZkjPN?=
 =?us-ascii?Q?eDi/YTQ34OPqe3K6POJyL25XS53k4DD80xjuRzaMuNMjEn9nKeWvV9r9lr82?=
 =?us-ascii?Q?DBnWin67illHOm9XQGxCqfUNuOHVcY+Eu6xMLfhIx6M6GlMhpm3+Q34TjvBF?=
 =?us-ascii?Q?ucz6JtK1TeIAS6mDg/t0QAvfMc9cIUeJ3G0vQYU/DQXfHusGpz46ssbkg076?=
 =?us-ascii?Q?x0O0sp0A2Rx8cU1P6NIqdNgNBJoyDDaNh71QObkYW6EPv2npWd0n+FsyK/3v?=
 =?us-ascii?Q?5IvZLNKBvf7/sroZYCojp6xhHVU7i0S74O00mtK+STJI01AFOj30ONNrCAsu?=
 =?us-ascii?Q?+thn82Ssb+NVp8pwNc+1I4YiR5NL7cfdubTWOY2PJtOhv4oP5ghCB6oUeJAq?=
 =?us-ascii?Q?iKd2HuZkF2V0jWKQzh5pQS7Icw+gptoLF7Z49LBAj83r/seRtfS+A4qedM0g?=
 =?us-ascii?Q?PR6LXVI65qCUXRkkQasWmUJbpXDVkG1vWHkC1eKIi1rQ1RfuP5YM9bxW1ReL?=
 =?us-ascii?Q?2/iI7yb5kbbu2nE/Et/+8EhX7DFKnk9zB6ySWLcWUedRWjMGwFJc/Igbkbs4?=
 =?us-ascii?Q?UTxWnJqs7CX3cqIQsjrFIZHZceoBwDrjgl/GiZnXl59TrG10rvDPzOAac3+e?=
 =?us-ascii?Q?t3jOtVggVZfBFv99CVWWkL/4mzq4hzLG4JHrkP/xnKFQQIu4XS+GoPZQOIRx?=
 =?us-ascii?Q?PhvZj+YaR7vQFP2ZwrNwQewChNn0BicDF05oSO6YfuQrczn3Ov8PbuVzJ0pL?=
 =?us-ascii?Q?09fJATxIaFBo+CeS/sIxZdWCDZ5+IWWA29dZza+cEWpGUPS5nnne8FfA1NPk?=
 =?us-ascii?Q?0zSDhp8pDHsnXJeuU0+XcqWNvWPFoDfu3afsxeWvw9SrywyYLYXNyokLMkJJ?=
 =?us-ascii?Q?95Z5LaORz8bEtfY+BfVS+UdP9Cj5y9jQi9tdnv9yCEM1w9WpBw/5OH5+thlQ?=
 =?us-ascii?Q?wQWcpm8ARcIfgWdeMbbim9h97UmQKEZtCmtRz34E8iblQS1yaeBRqNH+cM/x?=
 =?us-ascii?Q?AOoOqpO4Wr0aXnBv+fxslIm5DNgiEg5NrqKcHgGOfbGI/+Q9gGA+RW9QHk0Q?=
 =?us-ascii?Q?Mjl76V/qWLCmc/Z1sgfb8l1ZkMmnOj98zwkyZWn/oxp+h1nJrwf3DTkNHNKn?=
 =?us-ascii?Q?HpyQwQ5jknPpWlm3fuBoN+y0RvLVn+SN8pv+F2vWPHba5b9aPvard7EJAuKb?=
 =?us-ascii?Q?ccnvwY1tGWD21auTEP0ZEG2HP0ejWAV7rSTH+EZyqDx4Uiny+L/Ncv61GRjT?=
 =?us-ascii?Q?o+Tky2zEKrLvVO0jIEJf30cAyZ802nWkm795+R0WXZ/qj1DDVrmeRFW2akUv?=
 =?us-ascii?Q?xbYPp0GmMralPxrP6RLBdytRqXWkBYacMg/yz0RR?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c542fda1-9158-494e-4792-08db4e0e9798
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2023 08:47:58.4708
 (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: PNJH741QnCeb9rzrKx00RRiirTzlLJqSTiRe/BrdrK2lQHzPYfEo36wKh1bHTcuFWevva77UFTVIUhqOUrMVAQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6927
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,
        URIBL_BLOCKED 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 last buffer from before the change must be marked
with the V4L2_BUF_FLAG_LAST flag,
similarly to the Drain sequence above.

initiate a drain of the capture queue in dynamic resolution change

Fixes: 6de8d628df6e ("media: amphion: add v4l2 m2m vpu decoder stateful driver")
Signed-off-by: Ming Qian <ming.qian@nxp.com>
---
 drivers/media/platform/amphion/vdec.c     | 7 ++++---
 drivers/media/platform/amphion/venc.c     | 4 ++--
 drivers/media/platform/amphion/vpu_v4l2.c | 5 +++--
 drivers/media/platform/amphion/vpu_v4l2.h | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/media/platform/amphion/vdec.c b/drivers/media/platform/amphion/vdec.c
index 3fa1a74a2e20..6515f3cdb7a7 100644
--- a/drivers/media/platform/amphion/vdec.c
+++ b/drivers/media/platform/amphion/vdec.c
@@ -279,6 +279,7 @@ static void vdec_handle_resolution_change(struct vpu_inst *inst)
 
 	vdec->source_change--;
 	vpu_notify_source_change(inst);
+	vpu_set_last_buffer_dequeued(inst, false);
 }
 
 static int vdec_update_state(struct vpu_inst *inst, enum vpu_codec_state state, u32 force)
@@ -314,7 +315,7 @@ static void vdec_set_last_buffer_dequeued(struct vpu_inst *inst)
 		return;
 
 	if (vdec->eos_received) {
-		if (!vpu_set_last_buffer_dequeued(inst)) {
+		if (!vpu_set_last_buffer_dequeued(inst, true)) {
 			vdec->eos_received--;
 			vdec_update_state(inst, VPU_CODEC_STATE_DRAIN, 0);
 		}
@@ -569,7 +570,7 @@ static int vdec_drain(struct vpu_inst *inst)
 		return 0;
 
 	if (!vdec->params.frame_count) {
-		vpu_set_last_buffer_dequeued(inst);
+		vpu_set_last_buffer_dequeued(inst, true);
 		return 0;
 	}
 
@@ -608,7 +609,7 @@ static int vdec_cmd_stop(struct vpu_inst *inst)
 	vpu_trace(inst->dev, "[%d]\n", inst->id);
 
 	if (inst->state == VPU_CODEC_STATE_DEINIT) {
-		vpu_set_last_buffer_dequeued(inst);
+		vpu_set_last_buffer_dequeued(inst, true);
 	} else {
 		vdec->drain = 1;
 		vdec_drain(inst);
diff --git a/drivers/media/platform/amphion/venc.c b/drivers/media/platform/amphion/venc.c
index e6e8fe45fc7c..58480e2755ec 100644
--- a/drivers/media/platform/amphion/venc.c
+++ b/drivers/media/platform/amphion/venc.c
@@ -458,7 +458,7 @@ static int venc_encoder_cmd(struct file *file, void *fh, struct v4l2_encoder_cmd
 	vpu_inst_lock(inst);
 	if (cmd->cmd == V4L2_ENC_CMD_STOP) {
 		if (inst->state == VPU_CODEC_STATE_DEINIT)
-			vpu_set_last_buffer_dequeued(inst);
+			vpu_set_last_buffer_dequeued(inst, true);
 		else
 			venc_request_eos(inst);
 	}
@@ -878,7 +878,7 @@ static void venc_set_last_buffer_dequeued(struct vpu_inst *inst)
 	struct venc_t *venc = inst->priv;
 
 	if (venc->stopped && list_empty(&venc->frames))
-		vpu_set_last_buffer_dequeued(inst);
+		vpu_set_last_buffer_dequeued(inst, true);
 }
 
 static void venc_stop_done(struct vpu_inst *inst)
diff --git a/drivers/media/platform/amphion/vpu_v4l2.c b/drivers/media/platform/amphion/vpu_v4l2.c
index 6773b885597c..810e93d2c954 100644
--- a/drivers/media/platform/amphion/vpu_v4l2.c
+++ b/drivers/media/platform/amphion/vpu_v4l2.c
@@ -100,7 +100,7 @@ int vpu_notify_source_change(struct vpu_inst *inst)
 	return 0;
 }
 
-int vpu_set_last_buffer_dequeued(struct vpu_inst *inst)
+int vpu_set_last_buffer_dequeued(struct vpu_inst *inst, bool eos)
 {
 	struct vb2_queue *q;
 
@@ -116,7 +116,8 @@ int vpu_set_last_buffer_dequeued(struct vpu_inst *inst)
 	vpu_trace(inst->dev, "last buffer dequeued\n");
 	q->last_buffer_dequeued = true;
 	wake_up(&q->done_wq);
-	vpu_notify_eos(inst);
+	if (eos)
+		vpu_notify_eos(inst);
 	return 0;
 }
 
diff --git a/drivers/media/platform/amphion/vpu_v4l2.h b/drivers/media/platform/amphion/vpu_v4l2.h
index ef5de6b66e47..60f43056a7a2 100644
--- a/drivers/media/platform/amphion/vpu_v4l2.h
+++ b/drivers/media/platform/amphion/vpu_v4l2.h
@@ -27,7 +27,7 @@ struct vb2_v4l2_buffer *vpu_find_buf_by_idx(struct vpu_inst *inst, u32 type, u32
 void vpu_v4l2_set_error(struct vpu_inst *inst);
 int vpu_notify_eos(struct vpu_inst *inst);
 int vpu_notify_source_change(struct vpu_inst *inst);
-int vpu_set_last_buffer_dequeued(struct vpu_inst *inst);
+int vpu_set_last_buffer_dequeued(struct vpu_inst *inst, bool eos);
 void vpu_vb2_buffers_return(struct vpu_inst *inst, unsigned int type, enum vb2_buffer_state state);
 int vpu_get_num_buffers(struct vpu_inst *inst, u32 type);
 bool vpu_is_source_empty(struct vpu_inst *inst);
-- 
2.38.1