Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
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 v3] media: amphion: return error if format is unsupported by vpu
Date:   Wed,  8 Jun 2022 16:42:11 +0800
Message-Id: <20220608084211.24369-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?kcGTVmjthDxmP/uLfc+cH8VccrQo0+Eh48HKe9xihrCIeqCwCAGYOC+FqyK1?=
 =?us-ascii?Q?ziFG7T5zElu0SYrB8bM5QoSGjQB+N9x8IoQvErPIh70WMgkwY3uNaSL51Mpe?=
 =?us-ascii?Q?ahm8Kp3gNOsoaaFvzAiqv9nqKdWLb9A6VLYKV5kTzK7w0Y8oPwGfGeqgjiRz?=
 =?us-ascii?Q?GmQ4mC8yQCEJmE+L0U9vmdQYfHy9WbdDBV1GRGN0LelCZh4biGX1buKErw73?=
 =?us-ascii?Q?MvVMAKSmQzcl6+Q0a8tkuGBb3idSbMQujySSl4Y6wigFFqvOFwa6pio1a2dk?=
 =?us-ascii?Q?J6YmEpp9e/lfPU4b6mnGKU4XNl8mo2PEs99p6r07kvFdXp/oYFiZYKbiAK+1?=
 =?us-ascii?Q?ER8OpPiIi9YU1qhDmLqv+C4pvfHvNRqmFOMz6z6QrZrCcJs6yleg9CzoxjvG?=
 =?us-ascii?Q?a5qI3Ox6tZMrNPc++oQCsLYNSuQP8qplsUayk413M4xnnpY6Y2jNsSx+Ad0k?=
 =?us-ascii?Q?i9xokOcvJPIRCX9yjc78djMVMcv6U/uX9uXIct7gBKcnDjEAeXALpWrfIi/j?=
 =?us-ascii?Q?zwAsh0OdUn6pXgRd5PGqkdRCI8A07QsRPXeuRwATpg1zi62VmCDOIyovWu57?=
 =?us-ascii?Q?vwXS0/A/gPNPzHw24W75hnkyWUoVEUcmqOhrreEsbugJfC0nd+LSmOTFn+Qd?=
 =?us-ascii?Q?lxtH14TMv7x0HuhbM1YACCXOMhQz36iB3FfEKdQZdgjEsACT+/gcU/8sE530?=
 =?us-ascii?Q?aTkvH6nDonjnVmGyH7hGfotYbDyxlsEFuTjoWvfMfHUtZ3vj4gOjqv+wvm6v?=
 =?us-ascii?Q?oC1FMCrbqkpsVb8jBURSR8oR5affR8OVQgHtx4MDf2J8Q8DpU9XZdVdcnIUL?=
 =?us-ascii?Q?kt6UMivTcNLoE1zNPQXBzKRYMFRfFEtBJxtv23WnPfLbspORxKuJNkChBma7?=
 =?us-ascii?Q?5lcmL0+4Pz4BdjqFR0fxLdQpzWVbuT1kcuueFmbvvD4aY+qvDY6FTTl7JVNf?=
 =?us-ascii?Q?WdHmqRyVJcUtpO2FVGExJTeo4NpF65e/XWQjCqd+f4t9hVNfW9xD5YCWytC0?=
 =?us-ascii?Q?LMdY554yLg69qfte80lY4kMbPGEFr/1SEFhHDVKno+xHwkybgDk6rA6Gq8MW?=
 =?us-ascii?Q?qRLZOqnf3X1mtLtr8d6rbvGl+uZ3SAS6QNjQElvV6ccd9+GFoe4KYNG/jpoD?=
 =?us-ascii?Q?906m3Im1YpKajjMlyjU9JgULWmDytOh72lrzZCydmZLehH4aGbypKB1a56oU?=
 =?us-ascii?Q?WLAi6TzV6TynOTlL27CdR//Fz2rLaKdfmlmW6I/QDh2UjAj2AwP/kr6W7Rq4?=
 =?us-ascii?Q?7V4Fd1sMEseATd13RCbPkNNurX9qFVAiqjyj3dxv1AVnayzQ82QGjCs9geAv?=
 =?us-ascii?Q?bPeUCQVHaycMEPDhUtRJa7VuJ90qm8b09vm0appK+DzlhK4zLvKRQ7N8LQc3?=
 =?us-ascii?Q?2y/+C8sWxQpTONwgeQwNS6KRTBS1XMHt31HJt1WRaUwbtKrg0cx0IX56Z33Z?=
 =?us-ascii?Q?91MrWZy2PlamVfaLpzfzdT6e2WYcs8n9kR5DvOXx9Ytedc7yqKwinxRWbNkT?=
 =?us-ascii?Q?S/JCwgnenptsQYx1n6RwsjQ7hb4b33iJhwXtLl94cez0iVob0RurLzu8xRTo?=
 =?us-ascii?Q?7vMVcvWUSS63pJ6Dor3XSA5f4zVjwWh2rw0Jige4p7MUCC0wLy+3zoacoRj1?=
 =?us-ascii?Q?1uupOvlpK47tIAgk8nKADqiXNnX+qE0iZlNls5VZP+xl0agyLrJxtLt7UlDZ?=
 =?us-ascii?Q?b/U4NlRHTIDwxBFVUDxUhjK9DVWqJD3qfyWi0cwFLcuXNvFCbXnnAzFJmh2u?=
 =?us-ascii?Q?G4+Jr4wz5w=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 53151127-1514-43ef-ebbb-08da492ad1f5
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jun 2022 08:42:28.9011
 (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: 3M/lFXRiWWfHAOwAc+5SWCX6soRLK9YzSWzpnDfBQpp0x0RaELx87/wD6xZlPr7nvgUjt3bLINWjGQsgjsxzDA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4860
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=no 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>
---
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..70980cb4e803 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_ERROR);
 
-	return 0;
+	return ret;
 }
 
 static void vpu_vb2_stop_streaming(struct vb2_queue *q)
-- 
2.36.1