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: return error if format is unsupported by vpu
Date:   Thu, 19 May 2022 15:28:44 +0800
Message-Id: <20220519072844.31792-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?5Fg8+DXUjldYCB7H06sE88S9KT+MFl6KD8Z63pPbq1aES2JMltAJDLNnTRD9?=
 =?us-ascii?Q?QGwE77FgFFoq8BEf10iNmYLIhQlUhhnRT3OP9+DN79sj/dGhcXOiYjmA+mB2?=
 =?us-ascii?Q?/+ftXW0eUdaV83W+ZKtuzvq/KAh7eJmCu6XbRcgI9HUzJQrPS/NuIB/wFzGk?=
 =?us-ascii?Q?8BA0u6EyGqQtqRZaWcPNgn/6Ha6Db0AyJtw9SOEnYklrUrHpP3lACRrtyrl6?=
 =?us-ascii?Q?ZiWJDU2Y/CwwcgE/gfym2GRXLVlY/5Og5ecQFqziK9E8UE4YZyrVtayk9auj?=
 =?us-ascii?Q?fzay4yxB12qZM/DRSpIfPp6SY6SOX0bL1AFK4/n6Gt1MK7bGPG/9og3ju0d3?=
 =?us-ascii?Q?WCtzcRWl7bvTbhGYFXPZGjBi6wsWAR1qtQLDIYlFRh8GwfgQjoZsFP0f5D8q?=
 =?us-ascii?Q?FFbkGYG08IHJdHS0mIcvIeVBOCAC8r9WIeNkCm2V4av89HXQoeoDgBoaVAgI?=
 =?us-ascii?Q?AAYwen9zRl0HufqBF1fQ/lExZOrHdd2aJu0uTYRveTdeiX2LYQyRRvSlmyqB?=
 =?us-ascii?Q?v7NpBU94s2rDJWddN5yq24g+Vec5fNr3oIRR8Dz8zggdPvvo1EaMOxhBKeWx?=
 =?us-ascii?Q?G85Yt7V6q0TuEIftX+KA6JR8fMMqIlZssPn8kPQilfMt4l2CFNY4W/ycLjpl?=
 =?us-ascii?Q?zJpo3XOfKbtjkiql7jj5KNHBYJoKNah911KK9tx2Rb1oDryngSvWigeos0K0?=
 =?us-ascii?Q?Qp9ounUG3N95S+qEgDRI+Ch4bxXjpOK6ANrn1u6E5563AaHsVaTW4R2f4JUJ?=
 =?us-ascii?Q?xxyFSsuc4oiXDu49+PQ19hOpHr9BfmNR6i/Ez9wkRZ3pJ8chGsO1b5kKesWN?=
 =?us-ascii?Q?C9Dau6WZXqrv9UOFMTcgtQerzijnDlDrA/yfPZMZ72k17TCPIbP5Ul8zaReT?=
 =?us-ascii?Q?Vshu226jWJTHA51iHC2lWwduaJLBs2sNaLw4Tz1XfcaONVgtYT7tCKPw3UEV?=
 =?us-ascii?Q?kSsqTUTSrKw2WbaJDJkiDTygQlFTJ03HLGV1gndghnp6VLbI9By5pj+cKOFg?=
 =?us-ascii?Q?wf94xcpvH0am565l0m2kRDAMiCWrtIPr8HBloy/QYMraNYUUxr8FnEwr71HC?=
 =?us-ascii?Q?DwMm23yxT69AEZeCjpOrtCUSyivt0miDLyy5WHzdoA0ZsQFxg6/Vx0twkRFJ?=
 =?us-ascii?Q?l0chFMR4asK1vIkOr2YHWIJQD/q8d+KhlavA0hmxE/sht6VoGjVkryG0C7kq?=
 =?us-ascii?Q?LVJ6DkEgscEL7tjfbW9O4JDYBLNHIetVTHNEMe6049hIp92cA8eE0bOsj+VS?=
 =?us-ascii?Q?CI5JsQXIGr6bquD82xu21Sr5HkbKteoz7JCFEg5kXZaIkZZdWT9QUeyJ0UIQ?=
 =?us-ascii?Q?1MX+jkBFaod7k08dGXgjOKLLSjqMWoq0oV6vQj7d9S6PGU1cZHEcAFTVDsEO?=
 =?us-ascii?Q?VdEsbNjKN4Fvs07K37g21qF1/7ChGvzNUQ01SWy/RaHnWkoP3OnCz/fUx7Bo?=
 =?us-ascii?Q?PeSUStB23D0EGnb8jrxHGsfnirxLLfpyptBDb/YCaTwINSlRgJIBKEIIzBZL?=
 =?us-ascii?Q?kHlSAmS9AD92VGU57yY/0E5enA1C1UimnBCcgW95K8nccJakbt7QD1VtaGEJ?=
 =?us-ascii?Q?BhM0wB02d3oMBRIFU40FOmhdvmTrIakgzbZLEx5wyTT/uGbW0TBDB4j/+Ca/?=
 =?us-ascii?Q?wmKnYPmIYcZAMn6yChKVYtmzDNFEn7lA709uNe0hu0MhT9Rbk61fx+/b2HXw?=
 =?us-ascii?Q?yoyWBu7MxWfmRiZgsvnGi++RO8XjOvrd+D4aln7TL2lk2TyLTNcVuikxQo0o?=
 =?us-ascii?Q?1SfSXJ1WYg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bdc43f3b-d9b4-4ca1-c186-08da396945f2
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 07:29:13.5951
 (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: yEH/cqlymmEtl3kJi0686nvKUm1o8UDvifmonmnqTteVxm1O2eELDFTEt/Qsg0VjaMpM9SFdvyAGHIU1QbHz+Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4314
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

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

Signed-off-by: Ming Qian <ming.qian@nxp.com>
---
 drivers/media/platform/amphion/vpu_malone.c | 2 ++
 drivers/media/platform/amphion/vpu_v4l2.c   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/amphion/vpu_malone.c b/drivers/media/platform/amphion/vpu_malone.c
index f29c223eefce..0930b6ba8c42 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 (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..89b88e063e45 100644
--- a/drivers/media/platform/amphion/vpu_v4l2.c
+++ b/drivers/media/platform/amphion/vpu_v4l2.c
@@ -500,10 +500,10 @@ 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);
 
-	return 0;
+	return ret;
 }
 
 static void vpu_vb2_stop_streaming(struct vb2_queue *q)
-- 
2.36.1