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 v4] media: amphion: return error if format is unsupported by vpu
Date:   Thu,  9 Jun 2022 17:27:59 +0800
Message-Id: <20220609092759.997-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?88WTXu9fswB/89PcYoWH9ne5h1NbW6yFaNZ2HQDvmKcwO3XretFVVvpJxSJj?=
 =?us-ascii?Q?IoXiBB+gA0QE0G64YOIv7jMBjurGDT7MAVmm84btnwaXRf22t85VSdyqRkUr?=
 =?us-ascii?Q?9laLxvH9KMt/8Zy06YLx4cVUIz12uPMAVtRxvbV+11THPJdTezz7Wyb55PEf?=
 =?us-ascii?Q?a7df6ZiIAO3oSbuDbkj1yChhJ0QVW/D11PSiEZxUN660lP3RMEJv6oWplqS9?=
 =?us-ascii?Q?42/JkrJccUqajsk43GViAExfX0E+VlixwvsjiotTNhgoi0uJnRvLpfgEsO/l?=
 =?us-ascii?Q?QCnjXMAM7gcC4hB7ZyQPwHSt6iz0bQoHCzejW/hJPCFkx7ilHJ4vnsIqjVvt?=
 =?us-ascii?Q?k1EQT5O5/wlkgGD8HqY8CKqdUay/l25Z1sS+ydpM8l440ifbjmkaFhPwRwnY?=
 =?us-ascii?Q?3Q2+M0FL0+SfL0iwtiOKX9OZ6w9XqnGVnyDYgqoh69QOqj0lNtEDY0lTCHez?=
 =?us-ascii?Q?OOAos8VCWicxBEEEtbZMlaAilw7A0TIwgle5PYl1s890e6uzr8YjFFhBcFvh?=
 =?us-ascii?Q?2Y6VAY1LVDnErxXh11ewp0vwtw3a3+kvs5of6GWXjv4jjR/V/uXz2X4ThKEG?=
 =?us-ascii?Q?x34YRl3A4YhY7K2Jzqj5Hv1ZvJcgL9yacfNnOteIIS7bYA8lyO1BLx05Ns0t?=
 =?us-ascii?Q?ZaCYF0lBSpetMtz5MByjzKQJga2WONtVB3OvNjnMvHnl2uWoTDn+OZLl/nw9?=
 =?us-ascii?Q?FmvA8ewo/NgtW0d9lVqCSRyjydybQ3BaK8lS3EvpSN/FX8FZITbpsAyvgvL7?=
 =?us-ascii?Q?DJAs0OxPxTgVDe/GrzAt2AWHMG0x8KRwNcRf2QExZEbPIEJ9+Bq6ekjrsgHv?=
 =?us-ascii?Q?plJb54Loj8xnwb8ohSQKIe39qKRzTNzi6DBJnlz2GsJ9W5AhfRzJ7EE99JiJ?=
 =?us-ascii?Q?BsEV4bF491K4BE6tDprQiH3sXQjpABoW9AyUiEU4t4yEbcpCbiXH+rtG0lDg?=
 =?us-ascii?Q?CNC27xxeUmnWMeX/tTEkGPUibQHDlCw3YK/3W3x9ZeY13/gFoBIR/sC20NVo?=
 =?us-ascii?Q?jFERbPKuyRlH+FbvbySkip11bd+5v66xFxoFUvEsA8TLcfUwhoAZXkSwKWLZ?=
 =?us-ascii?Q?jh5GJMzJtfp8dm2faC8ITrkrBhpHk0Y0OciH3CoiXyErxrPY5XaxT2aMo7J2?=
 =?us-ascii?Q?Iza7al9/cUbWh72GfC7HZBLeRYSbIUyD0wt/UFNiC+CtpgdhgTrIOraJpDPa?=
 =?us-ascii?Q?oQzt6nm9wTKWstGRm+vUOdahMM5HvnRowD9bM6iuWShw5j0ELGsK9fLSLTX7?=
 =?us-ascii?Q?6fggFq+8nfkIz6Lk2f+3l62hNkKFSCtaIKAlevKZrhY4KMGTftrAK297TkJB?=
 =?us-ascii?Q?jJUhM8voLwKOVAp92vHMWZe2dNpOPQIYJQjXgsfVuUfoS4lkLwVh4K4jdpmk?=
 =?us-ascii?Q?PFLvOMoBTqhTSiupjZv6fL0Ie8b8GszEvQ4HDZ0wZY9k7/l+DTM3eyeYzFWh?=
 =?us-ascii?Q?UBdc14kcearwozX/7rIv66MEk4tj1Kod2H+rfUPtlu1fH6Zj9UGkVX+h8g/c?=
 =?us-ascii?Q?cUY0LCGAsAKLEdcK3gA3lMdE3FNK2K1DP6Ii4b6FH5E5l9MzNhxydKYD6yz1?=
 =?us-ascii?Q?yVF/fONKPgFah/eb4sYZ5aaL0w1JUcEX73mVlO8/Q8jvN5MkvjmE6i01cB5a?=
 =?us-ascii?Q?XNCBRSg+TXa23ePXXNVkzQzO+Q/wbncKI/kn2Pd2wbasgwju2sIZE7BYBhSu?=
 =?us-ascii?Q?JRC9EwC/eHM6RgKnU+r7FEya7CfQ6lhw/axVeGVEh2AzcfO/z03aViPvT/Pa?=
 =?us-ascii?Q?J3kkgaoArg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ab691977-6771-4907-c4b7-08da49fa649d
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2022 09:28:20.7090
 (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: HwFQflxkw4w4c2JC/jkCIQdlGqPMqjs9ETdJLRSGfqcH2Jd9v+1wAztGAYWGfuOeX7eGKQ9YXNnRAY95Lpo7Nw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4955
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

return error if format is unsupported by vpu,
otherwise the vpu will be stalled at decoding

Fixes: 3cd084519c6f9 ("media: amphion: add vpu v4l2 m2m support")
Signed-off-by: Ming Qian <ming.qian@nxp.com>
---
v4
- call vb2_buffer_done(vb, VB2_BUF_STATE_QUEUED) in start_streaming()
v3
- return buffers if start fail
v2
- warn on failed to remap pixel format to malone foramt
 drivers/media/platform/amphion/vpu_malone.c | 2 ++
 drivers/media/platform/amphion/vpu_v4l2.c   | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/amphion/vpu_malone.c b/drivers/media/platform/amphion/vpu_malone.c
index f29c223eefce..40267c73b1f9 100644
--- a/drivers/media/platform/amphion/vpu_malone.c
+++ b/drivers/media/platform/amphion/vpu_malone.c
@@ -610,6 +610,8 @@ static int vpu_malone_set_params(struct vpu_shared_addr *shared,
 	enum vpu_malone_format malone_format;
 
 	malone_format = vpu_malone_format_remap(params->codec_format);
+	if (WARN_ON(malone_format == MALONE_FMT_NULL))
+		return -EINVAL;
 	iface->udata_buffer[instance].base = params->udata.base;
 	iface->udata_buffer[instance].slot_size = params->udata.size;
 
diff --git a/drivers/media/platform/amphion/vpu_v4l2.c b/drivers/media/platform/amphion/vpu_v4l2.c
index 446f07d09d0b..da455e5ab337 100644
--- a/drivers/media/platform/amphion/vpu_v4l2.c
+++ b/drivers/media/platform/amphion/vpu_v4l2.c
@@ -500,10 +500,12 @@ static int vpu_vb2_start_streaming(struct vb2_queue *q, unsigned int count)
 		  fmt->sizeimage[1], fmt->bytesperline[1],
 		  fmt->sizeimage[2], fmt->bytesperline[2],
 		  q->num_buffers);
-	call_void_vop(inst, start, q->type);
+	ret = call_vop(inst, start, q->type);
 	vb2_clear_last_buffer_dequeued(q);
+	if (ret)
+		vpu_vb2_buffers_return(inst, q->type, VB2_BUF_STATE_QUEUED);
 
-	return 0;
+	return ret;
 }
 
 static void vpu_vb2_stop_streaming(struct vb2_queue *q)
-- 
2.36.1