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,
        linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org
Subject: [PATCH] media: amphion: sync buffer status with firmware during abort
Date:   Fri,  1 Jul 2022 13:50:04 +0800
Message-Id: <20220701055004.20821-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?mD0Up64EL3Y/c69U61sJhLwFZVuRMClKuJM+MLyoGMs7yJonXKatDbzV56HB?=
 =?us-ascii?Q?YYhQAoXglw2Gc+NyKztFiTnAjPP48WD3KBfOoqaGtoG+iTtDwYPQBf/9R2Rr?=
 =?us-ascii?Q?EpkTFjYeooMtySvTxf/MdL3vXu9/r7yRqCFa5bOdF8xYryQ0U3+tPcG5nwBh?=
 =?us-ascii?Q?R51aEIot+H2RAbzN3K2LxOfAAwp9CFKMI9YFSc+kBYZ3UyKCYoz5f03bUGIf?=
 =?us-ascii?Q?xps+I0LvvU6sBeS3jr5LM/Xu2X4Ow67JcHn9Viy9+tnfJk0poC8jeirPn+ZQ?=
 =?us-ascii?Q?0m4ScKYL20D1SiWMEsrgZGOpUTU9KhCrU4GSb93ISRo7CyALh0vWzgzfn/tw?=
 =?us-ascii?Q?95kQIKahQujPfHot5xO3L9vahYeK/PfYeSFRJ9aUwPhuXylXrJoRzMKO7kX+?=
 =?us-ascii?Q?luYIbEElIHJ7geOqcaWb8eQKEBYpKh2nOMg7RTDnXu3ix+vjp/muqBFCJiSY?=
 =?us-ascii?Q?sqbibyhZwMvTIgf6x5J1n7OOqBAMVLgMlZkKudboijubukZ6i23z/A2L3UTF?=
 =?us-ascii?Q?PsyMbEBMY72XYDX0dUvEHCPvyGDYpVZVRIPcdU+iYohMaXdfe5xSVYelyy6w?=
 =?us-ascii?Q?tLxZOKM0JCddYVvRpIpkI/d270afbnSLLtnfpTqiin2vn1poR41OwjIiv7Qd?=
 =?us-ascii?Q?ak9fsNza25aRVBlFyXwVRxF5dx1opUGzUA3/LK+MP5y9XZCISOLBcE0AIRZL?=
 =?us-ascii?Q?iV1lSyR88Jlb1q/t+7WHmYCRcikpvVimXyZj70AUuK8qZvK6D1002DPguWhV?=
 =?us-ascii?Q?GuGVk85U+RPY1jmnrLedfkD6VMHWAaoiWe5MkiJkpaR6Xk+SFTGHbjqOJzKX?=
 =?us-ascii?Q?Oo6NS70dFCm7E80+PdHPfTLFSbZU2QS/NE9MZ0qw9H2VlCmjSXSV91r4Xez6?=
 =?us-ascii?Q?3BpVfWLZmqFOwbcd2iG5vRmZxVSimWwTgRLj5aosFBoOLH2V2OqAwVvlEqV3?=
 =?us-ascii?Q?L0DCSwzZJnSfPaSSDzvnk96pnSpzfAWqVi1L0f8Oc12hPSue97AUF3PEFk1W?=
 =?us-ascii?Q?U1eaWUS4iQC3TxkxiLfDBrbv0Yo64c3Cx7Y2ozSF8tZAra99m5cEFO8MU9UG?=
 =?us-ascii?Q?QLsCaz3+GY4H4eg2WzRPc7M8fyol09z0VQqXDED9JellsQLICUwFkmQeRV2u?=
 =?us-ascii?Q?f5gZ96k7pPRu8CGkM5qshPpCkILXTRpWFJ3Wy1HmdC/isMhgALxwNwsW4MLl?=
 =?us-ascii?Q?fom1yw6eWNINXzf6KwfRMROjqRTYIK7IhJV4SJsAQzWBfstm5za1SWhO9yKB?=
 =?us-ascii?Q?3sKrFeQp+447FzxBiduGXOAkCMhmOhpisNYlZu08HmthDGhszTzU9RXWWwEk?=
 =?us-ascii?Q?dl8lxRJYardFGJia6k6cTK0ib1f4qwlIULCKQwxJoN/X7SFZMppQOgt6CP69?=
 =?us-ascii?Q?7XEZmKcyN/2kur3c4Ngzf1f9NwxRirSbvHirZgYHFYpI/6mwCjQHgvCshHVX?=
 =?us-ascii?Q?iMlPivBgcRmmukHIHoQyIGW5TQoWJI2d/3b5eB4sYsXw8xxOnGWp5KN4Yc72?=
 =?us-ascii?Q?86ZRIsueWHF0Yc+E0Tf7c1lAVeLFWE8lyd9f3wynGR0xsPkfKfGkNif5ILHU?=
 =?us-ascii?Q?ibNfs61qA12X4IOai4nb8QmYFcXn4KOmM93cAEAZ?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 810cb3f6-11db-4ae2-6b11-08da5b259574
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2022 05:50:20.7573
 (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: MJDluRbkYHzX2bageSp5G5Cg3U23PK19dUW3gkWucp+hikcf/NNmDseSY7MHIlcVEVRSxvf+QUT0xAoeKoD+0Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5521
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_NONE,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

1. prevent to allocate buffer to firmware during abort
2. release buffer when clear the slots

Fixes: 6de8d628df6ef ("media: amphion: add v4l2 m2m vpu decoder stateful driver")
Signed-off-by: Ming Qian <ming.qian@nxp.com>
---
 drivers/media/platform/amphion/vdec.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/media/platform/amphion/vdec.c b/drivers/media/platform/amphion/vdec.c
index 77a3a5c823f9..9e64041cc1c1 100644
--- a/drivers/media/platform/amphion/vdec.c
+++ b/drivers/media/platform/amphion/vdec.c
@@ -63,6 +63,7 @@ struct vdec_t {
 	bool is_source_changed;
 	u32 source_change;
 	u32 drain;
+	bool aborting;
 };
 
 static const struct vpu_format vdec_formats[] = {
@@ -948,6 +949,9 @@ static int vdec_response_frame(struct vpu_inst *inst, struct vb2_v4l2_buffer *vb
 	if (inst->state != VPU_CODEC_STATE_ACTIVE)
 		return -EINVAL;
 
+	if (vdec->aborting)
+		return -EINVAL;
+
 	if (!vdec->req_frame_count)
 		return -EINVAL;
 
@@ -1057,6 +1061,8 @@ static void vdec_clear_slots(struct vpu_inst *inst)
 		vpu_buf = vdec->slots[i];
 		vbuf = &vpu_buf->m2m_buf.vb;
 
+		vpu_trace(inst->dev, "clear slot %d\n", i);
+		vdec_response_fs_release(inst, i, vpu_buf->tag);
 		vdec_recycle_buffer(inst, vbuf);
 		vdec->slots[i]->state = VPU_BUF_STATE_IDLE;
 		vdec->slots[i] = NULL;
@@ -1318,6 +1324,8 @@ static void vdec_abort(struct vpu_inst *inst)
 	int ret;
 
 	vpu_trace(inst->dev, "[%d] state = %d\n", inst->id, inst->state);
+
+	vdec->aborting = true;
 	vpu_iface_add_scode(inst, SCODE_PADDING_ABORT);
 	vdec->params.end_flag = 1;
 	vpu_iface_set_decode_params(inst, &vdec->params, 1);
@@ -1341,6 +1349,7 @@ static void vdec_abort(struct vpu_inst *inst)
 	vdec->decoded_frame_count = 0;
 	vdec->display_frame_count = 0;
 	vdec->sequence = 0;
+	vdec->aborting = false;
 }
 
 static void vdec_stop(struct vpu_inst *inst, bool free)
-- 
2.36.1