From patchwork Fri Apr 11 07:43:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ming Qian(OSS)" X-Patchwork-Id: 14047759 Received: from MRWPR03CU001.outbound.protection.outlook.com (mail-francesouthazon11011014.outbound.protection.outlook.com [40.107.130.14]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0759E293B4B; Fri, 11 Apr 2025 07:44:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.130.14 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744357473; cv=fail; b=NcjyXGytfyIi3077wpnbE1fFbOmZYRx0Xmmwe1v8D83CJTqr8LYFIVw56ENGLIB/3inhWch1at7Ry+llG+7Xj/Hqq86IOtPwhDNLH40C+GHQxoQAqWhpfZSb3gBalI5xVRYEWpG8LUXuoz+FpngdyTIdZIG4Z4tP3VMfK6pm/To= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744357473; c=relaxed/simple; bh=QIn1cS1Wgvxn7a2WqWvj79BXUhNsyA6hOPKBHk74ZIU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=tbsVM5EQGpDJ2L3bwdnEe8iPl8LvlsY6MACfOhDaWoaVvnJod4sDjoXi+WwgwX11pTFr/K7eozsYVQXycO/vtRj+nR5k4mTfiyf6pRCSgQwpV8Jm4qBkYpuEC6JZSrf2Eqsbp7DS53JWUpSyvdtaWnTpuNpE4ZOPaXSwHXXc1SQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=d6LcUqZa; arc=fail smtp.client-ip=40.107.130.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="d6LcUqZa" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OYDL8ryC6QiUzgnbCtCMBikz2T6Zh834gYJHq4+TL63pc2rTd/SNiPAmBnb4uIPEryA/9V/iEvAEzqT/hgly6Zu4K49lJuDp8afuL/OKNkkxcAIuRUDpS/1S9AntGGN7oWGM5cZddBujnQzAv1BCZGF3uG8sn9vYgnLXKLpL2OerRSjRv9EKZ72YFIgpMCGsMSm9b4v2tU3bgi/esgFNgE9d9h+ctYF4VYGVgjXGaRphSmB51KQTPh3F5hRsVTgN0Eh9dEYu7m3+7HJBKrvbxTqsH1VLTnZW7RXBxViNjAUcvVKE6svTCWExod8wPJW/0icUxr6nULD3zPaRXlsp1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=f6OUlqG4tJ69vbFQq43A7z0TygpsxbNOGoF7+zcpXmA=; b=ZcVp15t8FU/3zZNaqjQPGR+xul4nwdMZpp9LOvWpJzvk3XSM3Bl0IVLuyElO7ActHnquUNkXEGHm4QngGm5SaNZRDRaqpl0u3VAW1uaFsLusjfQTofmwIRUxuPPax25ee+8HBj00dZjbX0+YnzqlhSk4sNbpAVqpWvuG0hO8aIuaSdC7xS1N4CW9h4KUG0bpnq2mwJzlNyJBoFNDWXNPIKTSurVbIwT6PyEWoKBGsyXanAzdzKM1Qu3mqr7Id4hvTJ+e1y7YdDNl4Rlwp8Z1E6zu5ROWHvjiXLaGSE4q6PSje1YfjuO50kT6U0PxMNXA+kBsHj7foBZZoLRVxO7tvA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=f6OUlqG4tJ69vbFQq43A7z0TygpsxbNOGoF7+zcpXmA=; b=d6LcUqZaWbitRWMFSpchB+55wk/Qw2WGIKkmfjXSnbmbQIN51+KEM0+XL2ZglyUnqdHnyzUWgIDAqy+5xuTuwv75u3MXsSrvRRzSFa45iwRX6maK1S4B2GmdNlf6s1ru36fBN2eUAcKzbhjyi0dsZGjgYn/gGDbtToed2S29o7tw8wclzWiswqK5daJoSAyIAGTANcTz9QXuvDjehhaocBlvyFY/eIsakfT7v3TTs7zxCtEOw3MJRkS6JXLMApqdH6fWrD0rlqanRmD9kO4ClYkftO7GcytzZQwk72i2KtMXHgR2+gTwk4TcOcY8eNtb2hkCgEFwDSx9++1jKwtq+g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from PAXPR04MB8254.eurprd04.prod.outlook.com (2603:10a6:102:1cd::24) by DBBPR04MB7737.eurprd04.prod.outlook.com (2603:10a6:10:1e5::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.34; Fri, 11 Apr 2025 07:44:27 +0000 Received: from PAXPR04MB8254.eurprd04.prod.outlook.com ([fe80::2755:55ac:5d6f:4f87]) by PAXPR04MB8254.eurprd04.prod.outlook.com ([fe80::2755:55ac:5d6f:4f87%4]) with mapi id 15.20.8632.025; Fri, 11 Apr 2025 07:44:27 +0000 From: ming.qian@oss.nxp.com To: mchehab@kernel.org, hverkuil-cisco@xs4all.nl, mirela.rabulea@oss.nxp.com Cc: shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, xiahong.bao@nxp.com, eagle.zhou@nxp.com, linux-imx@nxp.com, imx@lists.linux.dev, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 1/4] media: imx-jpeg: Move mxc_jpeg_free_slot_data() ahead Date: Fri, 11 Apr 2025 15:43:40 +0800 Message-ID: <20250411074347.809-2-ming.qian@oss.nxp.com> X-Mailer: git-send-email 2.48.1.windows.1 In-Reply-To: <20250411074347.809-1-ming.qian@oss.nxp.com> References: <20250411074347.809-1-ming.qian@oss.nxp.com> X-ClientProxiedBy: SI2PR02CA0016.apcprd02.prod.outlook.com (2603:1096:4:194::9) To PAXPR04MB8254.eurprd04.prod.outlook.com (2603:10a6:102:1cd::24) Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8254:EE_|DBBPR04MB7737:EE_ X-MS-Office365-Filtering-Correlation-Id: 55a0c18c-b0d9-4908-cf67-08dd78ccaf30 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|7416014|1800799024|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: L0++wAe+CtiM2FslEbcEhpXYmuLhWENHu+EL6x/W5SH8vhazZ9wacT9CfbUaURJ6dMPOYWjPazQ0CNJF5ZLf8P6DPHdR1C+hBO0rctmKWZVHtWCd9PMiRPDft2ntjlYmQbCTNmZr2AuLORkEvvI36gZbLSRWDkq1UC0dYR+aRnR8i1yl+myrYpOMCokiJX0x26LLQ2hYqFRAPSqCwXZp9joSA8OzdNsM4LM8vN7zsbtAR3J5hCY1iKx/Vb3FPwsly2n1ny/GYjMP8EKgyuZSLs5hw23ai9mYvTAsBs7q+CrKDsLofT/VVmCO2rU6uTCig/1sjqjEmfYtifITB0oRiLiXAydXeoKCn0rs2Cj6xJkItEG33aTd0X+n2KK2DFJQi0i6GQoqkECP8/l+WaQEcRggYr7hk6NUn2LmlljOSXVlkBe1qbFv+N5CZUG/oxJGb7FLXU9mHS8S/rgJmisYCtbwWMT7a9o8K/euJBt88lnNBn9yT1bvU+427NG9VlX4EQ7nhA1bzDLApRuJnL333R393KhnO+zzlZ1uXs/Llg4elBdU2jwNlgXczY58J2HxB4lTsuPsyYeBHP44d/GIhKScZ1uvEOSqGPnpkprmVzTklJJc04NJw8vKWkHV0Dsac+C/kvwjV6UDBxnNE+o/PsBGzke7908XVnUaJviCb9hAKumFKndKaZZ9xXfoijD/kRBDxt9fLw6Vsp/dA0QEG7/mTr3bMo57s0DLaeSccRXhhsTEnvZCS3yx0Hj/wIrf75+xNfPvRfy+iQZWFlYGxdseyb1MJ8cyMO1OSiLYFEHwadF/xlmj79GJEtElvwMEEgdpYusAs8hLrG8afTNH/a/fALTZx2/oZnu63067JjQ36i37eCBJqZi6SmaAHyUPOCLce+E3dbuljLKctG3bWGaHRATwX0xic6erS6JDEc4rdSz8ly+PJ/5w40ti0HcU6122Glm3pyJXSuBtPs/XzScUDkCa8b1q0aq8cwB3PA/O26w1im2FEBPqiJr6fqvWmc3SLdU7yawbLP8HC7ci+Xef20/dRSzLOQRECNehp0GpHaX9U31e25fECYSGhdVmhP6f8lmKNoGvEqKI5Ji+eVixpiTA2xSu72qgZAmKFZr0//mmpgmgbL3ipcAKS+Du60WCRd08c+6VB/VfHRsxmmfzeTLioWl+0nLtYjwuLDPlK+wxd1Yc5ldU9L//aQoArBV0sw3z6WKB4pRqp55+8uka9s3spmewi22SCThugXjjSZp/THKH+Oh+gU+wQ5XLmwbwWcAOCCPsPdINgqG/fSyXqCJVVQh4dhJ8fkSJlpksfb4aHcRoJramXyCm9iJ304JjSnp2NtggEH+auyi/oXvRZGILCI7csNPObiAofJWd/b6Xbr9YtNJI3sFljjA+gvLca2tJQUtYTPRsyPsedXLCg/v4kkkBL+SnhrnVoGAFIYX/AyVi25yDhzL3SuJNuN4FFN1R5HBhu4Cxds8Ctg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB8254.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(7416014)(1800799024)(376014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KtbXDJwRP3NWZ9JKl1PfTsoOXGRLKzGpgsRRu7ymbNDHSiDai+mhOOicg8LJFj726gRfiLCpdc92waKwLac0PVFzKIEOzITg7I9ueqPrNDSbWEgS+lOROHBBsfrd4Iu7ymXl3gUXZkcgEWntu5SQPu76GTP+sq1qsvSH7eh52BkjYAPogC5QG9MjELKqAnV+fhqcG4EKwsEBkIAHLTa78UZWlFFoNcaRlcZ+6UwbyY/F0V+c129ZMXgE5GLRGsqEeHi5Xt/GK7ZRxquzJb8nqzB5a34zIyj9StDvIeQ/v0/oimHHviZON+LiPnG2vLAmFuMZ2NwjVUS9HY3Db7qD25TlzHiwJf6fALOR+GQjPoQvfoSbPvi87GR08kbkEs+/B7AKivcJRuv3xGkNXpKjpHNa+a+gAiwuV5zNT6rTe/cfztGwVKCclahu3Cde4UEcRPFxHsmRiTYvd6K0E2IFBjHpciPFAA+LTSgZY+om0M8SL6bndoQpdg9TzJyxJEYwFd5URMMh6TFJ+hNDbg6Pt1vLouNKVrX9jO2kikThOTmZA718t5Qxmu8NWn6B3iPIqoTfvdYd+J5GsFYJE+/Q+Ap4G8TNgIimUaBHBLSA5jyNdvTv2bWb5GM2FU9CEdPCUdhtxR4ypsCvwV+PXKKOlkKEgg64l9w6V1PhHrOdkE5JarDhcC98lWe+5jEDo3FjJ0ONJdDWbv6EzS3mfMV7ZejEGARtDWXvkJSrEhF4MteMJ9BUUQjpEqUz3hx2orBni9EwvFiLQkipPVXoRr3FzZGBAlUlAcO072eyzhidouL15Rf9dh7ZpUAEpDl/STl+7KT2jLPJzYk431HJka5Wq3Oo3gm5Mge2F+Nf3Cr/eqo0Oi3yYajEnF5GmnK7e5VFbF6riKZXB58HHpndk1PZwzLP5xt3D+SAUtg+/qXnABLp+doisjU1mEvZw16bzDI7gvXbqy3GMl+OaOZIJ5EBpR5TTcUDF7H5cYwU6h4gDrnGe56oIhYmqc5Qwx8MQOooAxH9t4VsRQWP5vGaHLuhGRImENqhi/n8ubfWMRMLbjZtwMGvKT9CxM7bvht1MMDZzVmFtZVpYPfxX7cRpzSM0ZFwNq4ZsLl9oa695IJL1RW+bQnQugXD70ugXreEYbLWA1TUmosrUjgNz3ikEZ6l9WvNuN4rSe4PlXgDoo67Zz3peAh5pvcp4PwyuSIGQnZCOU/ysAeu2M93rscdKaMk4TL5/GsADVWLk7vDd+qx1nayf0Cm2ODoRG8xjyZpg1NdKQI7qKnRmKIMdb/XnyNUGTMRri8hPEkf5ixycq/XTclqRBrvbnrqPX69ab73CEnEFM2HvPX2PDtAttl5QUm5Im5Uxe5+GhuMCnvFJe1duATh1c8gXiWzJqs4jF0gIX8Qr9LnMIsBwg7IdJIB+3huAvjZy+s1R5zkxgcvws10q7NPbLnLm/f5krcdr5alZSbM9ZlrPyi/4wtxGKlQ7J03JXheliVVhhdLGzwBfxUbYRy3KCG4odTnXiJXhEM2alDL9g96W08gU7iQ1rKdSLgET4cQvECDRmC4NiGQHZ4Nok2Ip2aKQjCiWcsCRvACcrAN X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 55a0c18c-b0d9-4908-cf67-08dd78ccaf30 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8254.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2025 07:44:26.9806 (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: YqlGfI5lU+4IkK/A4bpQespq+rnIL6z20NmdIux7uvfSFsTCvHStssZYRvJSe/xefj1z/zQr1Jaz5vAsB9WLUg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7737 From: Ming Qian Move function mxc_jpeg_free_slot_data() above mxc_jpeg_alloc_slot_data() allowing to call that function during allocation failures. No functional changes are made. Signed-off-by: Ming Qian Reviewed-by: Nicolas Dufresne --- .../media/platform/nxp/imx-jpeg/mxc-jpeg.c | 46 +++++++++++-------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c index 0e6ee997284b..b2f7e9ad1885 100644 --- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c +++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c @@ -752,6 +752,32 @@ static int mxc_get_free_slot(struct mxc_jpeg_slot_data *slot_data) return -1; } +static void mxc_jpeg_free_slot_data(struct mxc_jpeg_dev *jpeg) +{ + /* free descriptor for decoding/encoding phase */ + dma_free_coherent(jpeg->dev, sizeof(struct mxc_jpeg_desc), + jpeg->slot_data.desc, + jpeg->slot_data.desc_handle); + jpeg->slot_data.desc = NULL; + jpeg->slot_data.desc_handle = 0; + + /* free descriptor for encoder configuration phase / decoder DHT */ + dma_free_coherent(jpeg->dev, sizeof(struct mxc_jpeg_desc), + jpeg->slot_data.cfg_desc, + jpeg->slot_data.cfg_desc_handle); + jpeg->slot_data.cfg_desc_handle = 0; + jpeg->slot_data.cfg_desc = NULL; + + /* free configuration stream */ + dma_free_coherent(jpeg->dev, MXC_JPEG_MAX_CFG_STREAM, + jpeg->slot_data.cfg_stream_vaddr, + jpeg->slot_data.cfg_stream_handle); + jpeg->slot_data.cfg_stream_vaddr = NULL; + jpeg->slot_data.cfg_stream_handle = 0; + + jpeg->slot_data.used = false; +} + static bool mxc_jpeg_alloc_slot_data(struct mxc_jpeg_dev *jpeg) { struct mxc_jpeg_desc *desc; @@ -798,26 +824,6 @@ static bool mxc_jpeg_alloc_slot_data(struct mxc_jpeg_dev *jpeg) return false; } -static void mxc_jpeg_free_slot_data(struct mxc_jpeg_dev *jpeg) -{ - /* free descriptor for decoding/encoding phase */ - dma_free_coherent(jpeg->dev, sizeof(struct mxc_jpeg_desc), - jpeg->slot_data.desc, - jpeg->slot_data.desc_handle); - - /* free descriptor for encoder configuration phase / decoder DHT */ - dma_free_coherent(jpeg->dev, sizeof(struct mxc_jpeg_desc), - jpeg->slot_data.cfg_desc, - jpeg->slot_data.cfg_desc_handle); - - /* free configuration stream */ - dma_free_coherent(jpeg->dev, MXC_JPEG_MAX_CFG_STREAM, - jpeg->slot_data.cfg_stream_vaddr, - jpeg->slot_data.cfg_stream_handle); - - jpeg->slot_data.used = false; -} - static void mxc_jpeg_check_and_set_last_buffer(struct mxc_jpeg_ctx *ctx, struct vb2_v4l2_buffer *src_buf, struct vb2_v4l2_buffer *dst_buf) From patchwork Fri Apr 11 07:43:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ming Qian(OSS)" X-Patchwork-Id: 14047760 Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11013046.outbound.protection.outlook.com [52.101.67.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3750A293B6D; Fri, 11 Apr 2025 07:44:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.67.46 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744357479; cv=fail; b=lmdwBcOdgknxo62Y5yysBofyMV94dE73XebPfjIsTfY0y72+gJuYuLQMYwq+0gSeZv+Al/yvZQDHkumhxTFwciXJoLsoRB2DlgUp1qx4/huIzUilJ5oHUSuRIGTmKzAQEQHtv8KhElfKPoONLNckEzppqKPfaUQgyuqnlIRG0ow= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744357479; c=relaxed/simple; bh=M8EMYRDnf7IYuxSOo96fLIou7nDjqk5IwOHm0aaAhqU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=db+QEsL61wLrRI2VS945qmrlTXfpxWP/yUgttP5qoCRwQnH/pkOwIlL1omyRHwLlCGMI9uhiae8eWjd9UA2tvz0PwG55zsPuWi9J6kyBN9xNk40czMBW9VskP5eR6uT6ZdGTCHDjr+jDWVheTlj3nYM/O1gWZRfD0+o9FIwFTzg= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=x0etFOZt; arc=fail smtp.client-ip=52.101.67.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="x0etFOZt" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uUUnaq47J/T3Tc8ouD/vDhn5ggmK5o7MAyuBGceo0q2VyF3YbYiIIQTRuZfrr2KCIHPU5Sji+TB2AGSsjym4KDD+O6AkH7zTp7pUZFwfr3t5vzZiuQ53+xjRD9f3heVNXToekpxd19rphG1S4jALf2z4A6utvQM0XvW62eBRyHOpGTgdjegCW6h2OaBGTEXjDY1uL7yqKv3Q5//KYuI68AFEYYvfJ+NWQow6Cu7MmK3atz2vfvTJroj/zQ33Fgtx4USUJnu30ikGkSeWGSiYO0Nr9qb40uwf7+R3KplGCgH13KNPydzdF75yEyZfG8Yc0Ehn5+OzCYR6IuhXYT4KIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=EbBELgs77b7lIUpwOS421z6ZzsJBpZxVQvu+YxmPQvE=; b=wySRgQqxGVW9ayuY82uq5f8G6DaKMbjragQPtvHf3M6YFvPKu1tKJRGOnusWPP5tNLH5kWPTu25lKWVIiYFpjnynaOw9tAfxMknd2F7Xi3rQw8jEGLg8mNjhfT5Nv6t9p3FZlkjGApn/R13u84XroWeCQ8+du2op5wc6LU/R7w10u1E0dTUI8js/7a0ukL3l9vkNcL5t5oQ2V185JYp8fSgdBB/J6pA018WthPnnURHaXxKaS2mFtXC6wc0r7LB3SUdEaJ0fwg34v9mE+GbhYuBQ/P1Th8lcpKUxlx+ALBdpLXf3XY7Uh/tcysv7lC6+kF1PC9PM44WmeQz9xnFdoQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EbBELgs77b7lIUpwOS421z6ZzsJBpZxVQvu+YxmPQvE=; b=x0etFOZtwI7Y0YtcXb4spo9XiZjdfNqjl/l6tNEdg26Qe5GqK58khSq+1133QprMo9MrFNyqGtXZgX31m/413tTxmCCc3YAJ79t8l7Nt1dyWoNZKyNiWFhPahfayq+vy+9LCRHzAVk24jvfOoYXDzZhK6Fzi/FljZpbgOR/lcq2XFDgP8XhaRgAk1qIeDfBLsJMxJGK1EL7AdCjuawpKFNCjQucCoXmJen2AvmHF98YGs6RJXsHEJbQeXQz4WE2ReLo68CcnwGf54gx6xzdsdvqGoHfO8rlIpr6d9dUg+MPmFC3t/PZtgqIaxgj19vq7Q/Tm7LAGxTzNsPLnNSSKGQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from PAXPR04MB8254.eurprd04.prod.outlook.com (2603:10a6:102:1cd::24) by DBBPR04MB8028.eurprd04.prod.outlook.com (2603:10a6:10:1e0::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.34; Fri, 11 Apr 2025 07:44:33 +0000 Received: from PAXPR04MB8254.eurprd04.prod.outlook.com ([fe80::2755:55ac:5d6f:4f87]) by PAXPR04MB8254.eurprd04.prod.outlook.com ([fe80::2755:55ac:5d6f:4f87%4]) with mapi id 15.20.8632.025; Fri, 11 Apr 2025 07:44:32 +0000 From: ming.qian@oss.nxp.com To: mchehab@kernel.org, hverkuil-cisco@xs4all.nl, mirela.rabulea@oss.nxp.com Cc: shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, xiahong.bao@nxp.com, eagle.zhou@nxp.com, linux-imx@nxp.com, imx@lists.linux.dev, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 2/4] media: imx-jpeg: Cleanup after an allocation error Date: Fri, 11 Apr 2025 15:43:41 +0800 Message-ID: <20250411074347.809-3-ming.qian@oss.nxp.com> X-Mailer: git-send-email 2.48.1.windows.1 In-Reply-To: <20250411074347.809-1-ming.qian@oss.nxp.com> References: <20250411074347.809-1-ming.qian@oss.nxp.com> X-ClientProxiedBy: SI2PR02CA0016.apcprd02.prod.outlook.com (2603:1096:4:194::9) To PAXPR04MB8254.eurprd04.prod.outlook.com (2603:10a6:102:1cd::24) Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8254:EE_|DBBPR04MB8028:EE_ X-MS-Office365-Filtering-Correlation-Id: b5c364c5-819f-4e5f-4637-08dd78ccb287 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024|7416014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: 7ncsjvC12aAUtRzxPnFT8qn64gJLvsCY0EKX3FIOT/ctL3BvFZi2I95eBCXGA/wHdy2VegB+XgKf5Vi2eEWIaxv8bKd5sijBdamgzplg+w/6+rrtaaQ2e9efuYzrAy35IbZLfAgjAvlEG4Bs+i3ZNvOVndJuNz1w6mWEutbW/pY8KlH5IiRuUyEJVmAlUYPr2G5GZtubmRvOwRj9R1lie4egM/SpSB+zJ1eveTWV7iR42xIHU0/7NQv0MlS13ZyIuwFfc86Qv0eahZg28brTNvB0mpEZCSabAGVNXDm13FtYAJ1hUqR7h66uWUFZmnagqTmHr+1Q3fBc+TPOw3P7osNS/bFFUEjOaS2hFOCkgErqeP192e326ccxFt0Kn8P/4v9vIAsknWmqYWvuNmnVBl7nky8R5tjpcW+4zN1btBeMFFcDMDPZA7yuVBb4rLpu3669ORaX/CnMkhcdUtHP5TLEA30cAvZOFEz9bYeeMkb+XbZHDA4EGWtNgyeB9L4/7Ov01mGbjib7OaJVs6j7+quX1PfROCOOndpooBdfqwRHF+hNm4DZ8F5fPVSQ67Je1g6KAk3KCE0R6MlxQgXW7HnFj5AWn89lNQJ12VcWSE7nglrLjG29GVjYlr8P1n32nl6baVyN5G4026AkVtzIb/BEX1Z+FKrtoFSyQOvIgmjQTSuKqtvtHKXmifYL/JG/ld4aG2NC3n6mtCSaiemOhcFM8SKLX6fDEPY7U8yVk3Xq0BWlRL5TymG6JADhJfTh/u1XSKHhA2YnVEvkrZ6TXDQEsK1QUe6hk4M76Rf7o7lFyjYRo/d5MqWGJLQf8vgOMESYYXa+HXxHR2ztS5/RS7fWEPI+P7JIUU/P16E4BfgBbnHhubhPN6529Vx6Qma8GfUBx4WKABjzHFxZOAgOoSnY4BDtkmyFbAnZBo7ePqmX4MQ07r8pnlNFUinndmmt+r8mHt49aAQXf9p63v56L3dqyaFE57RsRAHOYkEYWLBJUAN6BIwM5b9zPZDCIk6OoARq20npuJmuTqWlFUVPaw1JbpahrcBn5Hn5Gr/aXK7g7Nd+XQqR1ocZnTpjzTNJb5CFdP2lxhE8P+HEJ1nMgLLc9mUwihxXs8OEo5VP5d5s1zEi/EDLxATNvkp9VsHqcJKgxgAk5UJ7dXxYHqYTiS3nuQzm4FXYB9F3naksnMg/EW37iFuiI7/A+ktcBjaFKHnHmn4gAMmxFJrT3/wJGLyuxERthPKq2nVaZnS2fx9iYx0lzrEBgE9lCJIeNC/GfWlEP/HLoEOFsAG1r2841GH9fLoDrnOFe9vUQwYPfETs4zmfUOJvd8/bma0O4FJj0l033mrkrsY0vVSxaq4tCD44DnzCtOVRCOBQJWSJ2M38DffV0Ed9kiYhjn71/HG+0D699GoOzx6Ybek43Q9WS8TuaD4+D1W3zuGzlHR5Tc4HAphqtvacnsOHrtax5ng3gsCPO9LG7lVjROdOMy8mRTNGX8eiLO1OpFRAXyJoSyQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB8254.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024)(7416014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2fnlbW9mRyS1fDuhLogFYJc2dStdAy0gInTzAQ4ayM4ZKaGnz9NBaRVu+e4YMmuYiiVDA+8PL4RMBR16Kj2XmD6BEU/ESCsODwvP3Bl5PQChg7KT5mvpoEtIe/l93w186MMgIz6gGopF/HWcevNTA/cDujUztR8Tb3QNC9d2wXL3esfgeS4wYBQv3lT+SBRn4iYOF7UOzNaVnLwkgTj1F8BwsUPH9MiXvN4I43D6KCxIZVvN/GbvOFx3oYuPta18piT6gMqEELmmkVo/9PRd9E0p/l2WuPnoGRybNx7oZfkC7Mg1dcE7h6ZJkLTEmKBFm/w6H93rGJOlZG2sR6kpIrXu2ZdWIAeIgcVVlywP6yFBmqyUAD65SKqo5Yfu/HDEZbYGBEtB1ENC0VFXiX+qMs3KU6hc7LKRGu6HIjCf6SUoXzM/vHPi1LYf69bQbpfL7ib7/uyHNG6gZlDiNxciEi8yBt/pIHuNK5FM/XSPQiBZe8HoSywQW7YxjDqMCv1EBXp6LsB2gymqa4a9HB6daKcDm6uUEy6U/SxzvzxOXVBjmVmo6bWNe9UQp2PKY4fLqcldECWfb1xNGbYA4K2ZYPXFBP8sg1CnWrkXsnEaGCDcZkz0FwDbO8AFChVyxUzM4JNWnWaF0Q09I9rYW8urc0Lv5DDskbF9eIAUNfJiVrzwf2Zh12lxGDcWRCQV/CIrYuyIGWo31IyhvAwl3/1PjR4a63yhC2aw+VVTREHnkIhCAyXhnM2P0P+eG4MwN/EWOeR2bbzo7D8ZTVitHHqCg1LK0REYIooibgC34OEBO2qRqSMuS9fc2dJiDGBqIXp8H5RbXIBA0TeJD6Qx5xq3hiDMgQNxlOVKfXXi07slDQU1TFFqs8djLKCKMOFGl7kOSCVf8BfeDm1R1qru9DwGhYII5DBvWvPQr/z6h9FFRfhe2ThJllY2YcYxb9+1/Mly4Y+5r17keqK5WXBKlXRkU3bom76b5H/j9LvsZ1+HM08AOjtRXcd4TVdMYtKyR1JynejZ3irALqaBXiOCeqbL5K1izER2d8uBL7Kln9N/RnzbRU7DCJuEu2LTlkIiRIpz9+h9IcF6wi5s17JyDTcuYEjL0EJq1eY0giY0dUnSckaKGvs5v8Oeb4lzwIykzy/MFLC38WVoYDzyCWC9wa2X4/Ygs3Rscig7Xl11tH3I+blXOiRKzPZ//5uANq864KTlDtlbwTsRmLJCe8WkzSI3F/d3V5+VVG94Jt6GKy3ehrgzXp9ZMllS2u0PqkmeeIt4leFdHQ34Z61pv/pcqmngvtxvCPwciNF/m5EpM5VIAKWbfKVYm2dJMNATBifXNleb2SB3iyeSoh6B5p66+woT7qTNkVEC5FVSqZDa1vslSmT6NWFS54KSqNfvqkZ5z6xOqlKHjd27B3JB5mDbwpaTn0XoSBWjLXVfilay0UylVaL6P+JqLI2w3oLyJIk3e/8zExmrwAhhUt8Jz1xVsnsucGakB0LQkxthn6FtVRBxI65vEXU4P9+2yO9H0aYMF8ik9c3hUxozCXByDj8rXHLx2Oo/nwY3EZNp+x+pEHXjDuajT2Y/Vi3H2GyIDy4OrZvq X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b5c364c5-819f-4e5f-4637-08dd78ccb287 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8254.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2025 07:44:32.5426 (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: nXOONw2APEw4jHpyW1MEiTS7TIYbJ8XIvrVjla/jVX71RsfF93dhZCf/xxv8sKkMNrcQYDONddv+AQzQArMXHw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB8028 From: Ming Qian When allocation failures are not cleaned up by the driver, further allocation errors will be false-positives, which will cause buffers to remain uninitialized and cause NULL pointer dereferences. Ensure proper cleanup of failed allocations to prevent these issues. Fixes: 2db16c6ed72c ("media: imx-jpeg: Add V4L2 driver for i.MX8 JPEG Encoder/Decoder") Signed-off-by: Ming Qian Reviewed-by: Frank Li --- drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c index b2f7e9ad1885..12661c177f5a 100644 --- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c +++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c @@ -820,6 +820,7 @@ static bool mxc_jpeg_alloc_slot_data(struct mxc_jpeg_dev *jpeg) return true; err: dev_err(jpeg->dev, "Could not allocate descriptors for slot %d", jpeg->slot_data.slot); + mxc_jpeg_free_slot_data(jpeg); return false; } From patchwork Fri Apr 11 07:43:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ming Qian(OSS)" X-Patchwork-Id: 14047761 Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11013046.outbound.protection.outlook.com [52.101.67.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5802B293B6F; Fri, 11 Apr 2025 07:44:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.67.46 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744357481; cv=fail; b=PyFlgxjhwJjWvAHk/dXCZXNAwjgYNI9V/zvhnesXGNoHKEVO8VTwIcvNYOCyDG1FSVHP877CoE4/q/t8iERB5w4dRQL1Q/2y/V36mqPx5dHOUujeU/9iR4mGKKOWpXWlXbazJhkyNywCoX0M0cPi9DuGGXWVYtaHq2qARpnkoiA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744357481; c=relaxed/simple; bh=ME8SuFzZ4v6a8do7HqZGfaVflAsgugr117l82XRjXrM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=aRuLUGz6gn8RAp/BGFCkXcDljsStDdHgTEjTt6RAny+34z2QOO+o6aoq7/A+s5sobVV+oPQFYUSONXN2GjI6CBVYvB4UQI9I9MvqGLu0EZ6gpOC8/YefE4WMPu10xihSghX52Uc0NE6YtSlCLMasYlQ8XoEtqqA4jjoZfqpsOuI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=H3ait/bH; arc=fail smtp.client-ip=52.101.67.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="H3ait/bH" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bl3bcmseHbjhpz7/ziEMAcT0wiLV4xxTg+Vu9VZFz27jgCh41DH45wdHUn01ivstLm6SqaqpYnEqjIwCiRDnpTYkvAPxof501whei2FfbxRLBI3nDbY6Lu7GgL65TOUpPmHFYSNtTUQ8M4VY4VtXqzB8UZjimC/8oB3HOAea5qVNkTwdH5kqjTY8lEHBiuZeg8G2rNYhH4fGdrAnHOPzkOoG0S2AKacbjCIfYuoJBEvlCZhv3t4LZNvgAunoq9T85iVG36oUk30EJ5lbXNJsrPRhvsjm2aINx3yndQy/wXLrtqOgAevaKbR8NXmAXZh+6QBfmX1vjw5TVfw/eWvxhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=j/D6T5zFsRpfpJEfS5Zlr2nAIaNHGxMB/wO3S50O/zQ=; b=c38MU/MMjW6d9pu7zXrECfnSG7reWJhTkqe5PQnB4WX7SULPXA7im4RVJoGn15SpUMkyY3/2vp55/CrU3al2oJ0y5SJ9VhD83nIpOV2z7n+gjwCdmv/tn2D3v0t2oXsIZVizEceNR8fvs+tUYJvmltjeeolXMopI3tD+ihiaXrhHBg0PdUrc84yzVOYIdztOiqqaqQYpB+M28jWQ+92o/PRhK5RRex95XcPNtyH1SoRt6wnQQE2hVxaVoOf08DiLUU2RWpdv+mii/XdVmDOaDpz6Bm9vGN+aQlWcWrfhhwvCjp8qZGc7Fp1ledr/e5QtVtFjHc9s7tm1Tw4ZSZQiNg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=j/D6T5zFsRpfpJEfS5Zlr2nAIaNHGxMB/wO3S50O/zQ=; b=H3ait/bHyh2FbeHJFWtj4kcg575v3tkApmaLmSbt3m49RW0TFHR97o1MZgzkNZzvH3tYDb1JT05THFsyBHpcaYpIoibGGQ5+Q5hI75MLuZV7+obk1X1RG7ZtY3ODklbk8QXEJhPR5bUp9ENEBGnt6xw9cgUaTbE9bsN3HhU0uJ9NR9iXMrb//9NGR+yn16QFYrpKQkOuxV66Z0yQVhsP5h/7iEm8lXAeKkjTciwIjbJafkZgPiPkNFklhYx3/vahO3s8iA3NjhGeIZJ/gROB/CRD0hCRTuNMXW4lSJ0xP2GiAwa4N2DpTfvW7lCm6rV8d+OflO0MvqlXxd8ZD07aaQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from PAXPR04MB8254.eurprd04.prod.outlook.com (2603:10a6:102:1cd::24) by DBBPR04MB8028.eurprd04.prod.outlook.com (2603:10a6:10:1e0::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.34; Fri, 11 Apr 2025 07:44:37 +0000 Received: from PAXPR04MB8254.eurprd04.prod.outlook.com ([fe80::2755:55ac:5d6f:4f87]) by PAXPR04MB8254.eurprd04.prod.outlook.com ([fe80::2755:55ac:5d6f:4f87%4]) with mapi id 15.20.8632.025; Fri, 11 Apr 2025 07:44:37 +0000 From: ming.qian@oss.nxp.com To: mchehab@kernel.org, hverkuil-cisco@xs4all.nl, mirela.rabulea@oss.nxp.com Cc: shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, xiahong.bao@nxp.com, eagle.zhou@nxp.com, linux-imx@nxp.com, imx@lists.linux.dev, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 3/4] media: imx-jpeg: Change the pattern size to 128x64 Date: Fri, 11 Apr 2025 15:43:42 +0800 Message-ID: <20250411074347.809-4-ming.qian@oss.nxp.com> X-Mailer: git-send-email 2.48.1.windows.1 In-Reply-To: <20250411074347.809-1-ming.qian@oss.nxp.com> References: <20250411074347.809-1-ming.qian@oss.nxp.com> X-ClientProxiedBy: SI2PR02CA0016.apcprd02.prod.outlook.com (2603:1096:4:194::9) To PAXPR04MB8254.eurprd04.prod.outlook.com (2603:10a6:102:1cd::24) Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8254:EE_|DBBPR04MB8028:EE_ X-MS-Office365-Filtering-Correlation-Id: 270be5b2-5e9c-4542-6f89-08dd78ccb59e X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024|7416014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: Rc82peUE1Ar+FHTxrFtTsjwdF3V/NWu/mWCCOml+uWwKD6z5BWBSS8VgXVk+T2zIOde8jYJvTK78+ZBZdZ2mWnZ1qnenrFIas4+flPIqaPspUw4wMaRItN1Jal0NJF0AaPqg3DXRqsi1MjDdb0YMk52SwF8FIyndIDlav56N1BwXb45/sjjQxPc8EMl5il5Vc1seBMZS1b8zRSkdQo9gNjqks28zCQ1fmcCM5i4PwMyUhIztJG5FPFi5KuOpS8dhzqnYwdXCGk/+OUrNhfqVHGS6KTavLl1TxvVPjfe6/LkOuxU44C3pRmpkFTi72ltO0j29f5+H/yW6xpz02J5CrwrnNiPAD9LKFUXzASndQ9+rS/aqEbsc5wYeIF/DJKMNM9DWyiPcVvSayizEe6d4e8+G6wQURAvCn2uIwFn0mRhP8AfdPt0CWi/BLPmDg8j84yMIbyTJoCqrZQRB0VGGQeBrc1WRMfg4twVBlbo9lkx6JSRdylMVPsroovMPTXky3X63RTyTZ9NWeZ1RykN3HFKUcWbX36odJKBH6aNeFWtgO9P5nyiRmwNLMGqAEXAYoo7hqKfdFfF5pCnZKmcrEgeA8fctjWFidhwjZAVyyuYny1izn9ns1PfhgDNiFrhnZKNE536nTsdnevv4da8s+JptEc80EXGtjc9ZuoLSgNKCUYOdALHYDpIKqQXBaJ6unAyOMSuvV3PAsL7rjfwl+sJF3Jx3LSQDyro6TyNSbK3EGor9CruiKkZ267gf/dhpZN3nmNFEZzrbe5QOoLbW5QpzAyFciTcwfXbncYxSF+gz4+NFJslW1FdTKdF0uIC21Qem/47Da2z9umGu3/3CEIF8NpM6lCxtxpYJ0mfFrmzYuFffRSpi7mXOzIcrM3qpWZadJUkAuZusdBW6sav3r8DzFjsan7eeVa69W4K8WluFpxiRsl6gmuK1IYdT6IJv3z9Og5cnD+yKX6GG/PxcZjlpZYzkTvovyMdGE1yFEHjW0qm8mSg4eIrhikB/OyAuM5707zGgDk8UVJgD1jyOg3vE2skzFvMIxg72UHPbs11vomNPMIGs0cPqJQIytzHzB9s2dx5rxR571Q3MP5b2r1ZEQUg8E67k/l7DtQ24YTiPAu/7o/UuDExbEy/LHdEHiUix117Rs3I3KJd0wbrYgwxDWBv148Nu5nNH6rhbzomNwHaM+bq33ou6aaig2mMOQ/1v3Iip1Y92v/JPCN1ts9ALrAHO/ZNqWOtcXzgzr1xfsy/5q8CpbHggjdTTtBpIsQxV9PR01jG/udJbHa0RZNA3D2wrkAZtLypD/D0Pw0PuoSw7HASTPxTWoSbkajQImqzK1XRqyjxX4zGCPQGdpp8FArs2GHbMW/RB/ckx+Zi5XJXtV4UOVzeG4rT/zgVKEYQKO+UR5zc7MXxrsSTX83RP+5fDicEBx8xVvIW1HmuTeEPhybxIj6SHwii1vC0ko4wwSJDdZyV+p6cIG+gbcxX/bgIzxnagjzVTIB79WAo= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB8254.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024)(7416014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4pKUz208lAmkYL1WaAtesvty/T9OOC4FUPa4tcM+6uzudZWHZIrT9VySwXkwNzpFQQa3ig2a340t74w9z5uePKYzMYEJFMzQAvF9gX/EjBSpmEi/dmOKrR041wjUXj8cce+IwjVi26aNZjUaDY0PYB9zunqnwcURDQaOjt8CxhBg1TyIldRC2wQD8fAPkhtCcQWhpxqWKGqa9GGBTLhK9iXAVlzvY06IqMDfT7iqkx87zabGqwLhYo6ZRc2huEK4uMsH4Rnj+dAecRY+YnBiVVRQ+uhkLaHC4PsTHQMANffxR/+mBG8dJzdZHZIIA7Fdwp7ShG5bVLrJTE72sR25w6YkbH/Y5fX4f2f8Oevy4h2MVquiPHVrc5iGM/EbtmJKkSrfZ9Y5rcOm2mX5q3tWr19apquE10ej84TpDJPzIxmYQ50D/plW8xCDtFuecFz8rtrukpYgUajrVWEYNB+EfAgIQ0TpuHvEk/3rTty099bf5Bs81fZ15zClUCVmoDK20PaSwY9rLnsmTqHapmhO/pRN1MKcItdkT7SYZLAuUNIZLgAo0/mBp8Hz+HmyW89NXLyvnzXTS57R10IOE8KwB/TGnGUtE8B9aUCp8b4jpa/vxqKakTwihAH+/nMcC2xKu1zBFs7oFEmEDbottOzGfDbkOzQFwWP/jm/SegYGWNHW8LOlKyJJdXKFyZgzE188rIpEM87EqqbZi1xQk2roDQdkUmUL5zRVg07c7/sR0b/QgIi2i4SCU/0bYMipg1KiGr6IIIsxDlNix8pmvgl9X+5pDchEUBEFy5HO3HpDc79AH2zj7gAZU9DEH32j820izz5EX7nHs86hOJfa/BOmEH3MKMTrttm5nPdsczNevg3ey2PSKE7TjMueTuoNLqiOFUDATvOJw54Ktmx8C2aYw4M/OsWQeMMpmAPJZXwGyMGLnG70K9QbCmy/P1FtdpZvbFlETU+qfcRVSmzhS7OX/bfnKH0zeN/EemDR7dzEGvOqaOGpeOA6eyle2LkONFkYD+J75f7oy/o4XuXOAipgUKXeyVEV96aY9OswKV6HZou9w+Vydwf5Yk6466ZSK0zMnpJKInR00H5n8b8WS3nBxJi8zEISL0NeIvYjaNSH3FHCzgzenh1MkX6KbrXa0q4yNJLHes+gZ4nHMsD29Psb9sVirPj2XYhPhCMS6EIDS0HZj4MFSFzLkjqH4TQjb94OdxHc2gAT+rO+h9sMRTY/SORzU3UiFIrHudtKcizbuYUMuAqdIzH4RrNdGwDRzKujdIf+aLwrqJMzDXgFx9FLwKBYCbiV5i1a2HhAss1hsnHpSBWMG9lkYdBNpxwMlOdxXnTq1A468K3YqhUNobWYcN+PIkg8mHv2Hx/3bN/XxobGEju7hiF7Fh00ZZCaxXii7bar9gnTYW6oPu88bS/lNBOPl1oH841+E3XD+h4Dy4jKXeJInDV9M7EN9CFnASEIWy5NcJCJQOSZjHzSt/a2AvxaOP3NN4YxqvqRz2hE1TlFYX7clvaxZT2Zbo3bNUeuH267/Zjagk3mWYD3FAq0RHtu/cYxWjHx8CGz/wEOwduBTZHQZ8ptUAnwa8xNLj3y X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 270be5b2-5e9c-4542-6f89-08dd78ccb59e X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8254.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2025 07:44:37.7726 (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: /2JGjIzQ1TVD/qlo3cEcFtEnHRHpm9HiTSWcKFuebBuz8PCjEQUUCaqODmC3AmZjRNl2B8dZp2B2dXMarV/ELA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB8028 From: Ming Qian In order to decode a motion-jpeg bitstream, which doesn't provide a DHT, the driver will first decode a pattern jpeg and use the DHT found in the pattern to decode the first actual frame. This mode is called "repeat-mode" and it utilizes linked descriptors. The smallest supported resolution of 64x64 was used for that pattern to not cause unneeded performance delay. This choice, however, can cause a corrupted decoded picture of the first frame after the pattern, when the resolution of that frame is larger than the pattern and is not aligned to 64. By altering the pattern size to 128x64, this corruption can be avoided. That size has been confirmed to be safe by the hardware designers. Additionally, a DMA buffer needs to be allocated to store the decoded picture of the pattern image. Signed-off-by: Ming Qian Reviewed-by: Frank Li --- .../media/platform/nxp/imx-jpeg/mxc-jpeg.c | 42 +++++++++++++++---- .../media/platform/nxp/imx-jpeg/mxc-jpeg.h | 5 +++ 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c index 12661c177f5a..45705c606769 100644 --- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c +++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c @@ -535,7 +535,18 @@ static const unsigned char jpeg_sos_maximal[] = { }; static const unsigned char jpeg_image_red[] = { - 0xFC, 0x5F, 0xA2, 0xBF, 0xCA, 0x73, 0xFE, 0xFE, + 0xF9, 0xFE, 0x8A, 0xFC, 0x34, 0xFD, 0xC4, 0x28, + 0xA0, 0x02, 0x8A, 0x00, 0x28, 0xA0, 0x02, 0x8A, + 0x00, 0x28, 0xA0, 0x02, 0x8A, 0x00, 0x28, 0xA0, + 0x02, 0x8A, 0x00, 0x28, 0xA0, 0x02, 0x8A, 0x00, + 0x28, 0xA0, 0x02, 0x8A, 0x00, 0x28, 0xA0, 0x02, + 0x8A, 0x00, 0x28, 0xA0, 0x02, 0x8A, 0x00, 0x28, + 0xA0, 0x02, 0x8A, 0x00, 0x28, 0xA0, 0x02, 0x8A, + 0x00, 0x28, 0xA0, 0x02, 0x8A, 0x00, 0x28, 0xA0, + 0x02, 0x8A, 0x00, 0x28, 0xA0, 0x02, 0x8A, 0x00, + 0x28, 0xA0, 0x02, 0x8A, 0x00, 0x28, 0xA0, 0x02, + 0x8A, 0x00, 0x28, 0xA0, 0x0F, 0xFF, 0xD0, 0xF9, + 0xFE, 0x8A, 0xFC, 0x34, 0xFD, 0xC4, 0x28, 0xA0, 0x02, 0x8A, 0x00, 0x28, 0xA0, 0x02, 0x8A, 0x00, 0x28, 0xA0, 0x02, 0x8A, 0x00, 0x28, 0xA0, 0x02, 0x8A, 0x00, 0x28, 0xA0, 0x02, 0x8A, 0x00, 0x28, @@ -545,7 +556,7 @@ static const unsigned char jpeg_image_red[] = { 0x28, 0xA0, 0x02, 0x8A, 0x00, 0x28, 0xA0, 0x02, 0x8A, 0x00, 0x28, 0xA0, 0x02, 0x8A, 0x00, 0x28, 0xA0, 0x02, 0x8A, 0x00, 0x28, 0xA0, 0x02, 0x8A, - 0x00, 0x28, 0xA0, 0x02, 0x8A, 0x00 + 0x00, 0x28, 0xA0, 0x0F }; static const unsigned char jpeg_eoi[] = { @@ -775,6 +786,13 @@ static void mxc_jpeg_free_slot_data(struct mxc_jpeg_dev *jpeg) jpeg->slot_data.cfg_stream_vaddr = NULL; jpeg->slot_data.cfg_stream_handle = 0; + dma_free_coherent(jpeg->dev, jpeg->slot_data.cfg_dec_size, + jpeg->slot_data.cfg_dec_vaddr, + jpeg->slot_data.cfg_dec_daddr); + jpeg->slot_data.cfg_dec_size = 0; + jpeg->slot_data.cfg_dec_vaddr = NULL; + jpeg->slot_data.cfg_dec_daddr = 0; + jpeg->slot_data.used = false; } @@ -814,6 +832,14 @@ static bool mxc_jpeg_alloc_slot_data(struct mxc_jpeg_dev *jpeg) goto err; jpeg->slot_data.cfg_stream_vaddr = cfg_stm; + jpeg->slot_data.cfg_dec_size = MXC_JPEG_PATTERN_WIDTH * MXC_JPEG_PATTERN_HEIGHT * 2; + jpeg->slot_data.cfg_dec_vaddr = dma_alloc_coherent(jpeg->dev, + jpeg->slot_data.cfg_dec_size, + &jpeg->slot_data.cfg_dec_daddr, + GFP_ATOMIC); + if (!jpeg->slot_data.cfg_dec_vaddr) + goto err; + skip_alloc: jpeg->slot_data.used = true; @@ -1216,14 +1242,14 @@ static void mxc_jpeg_config_dec_desc(struct vb2_buffer *out_buf, */ *cfg_size = mxc_jpeg_setup_cfg_stream(cfg_stream_vaddr, V4L2_PIX_FMT_YUYV, - MXC_JPEG_MIN_WIDTH, - MXC_JPEG_MIN_HEIGHT); + MXC_JPEG_PATTERN_WIDTH, + MXC_JPEG_PATTERN_HEIGHT); cfg_desc->next_descpt_ptr = desc_handle | MXC_NXT_DESCPT_EN; - cfg_desc->buf_base0 = vb2_dma_contig_plane_dma_addr(dst_buf, 0); + cfg_desc->buf_base0 = jpeg->slot_data.cfg_dec_daddr; cfg_desc->buf_base1 = 0; - cfg_desc->imgsize = MXC_JPEG_MIN_WIDTH << 16; - cfg_desc->imgsize |= MXC_JPEG_MIN_HEIGHT; - cfg_desc->line_pitch = MXC_JPEG_MIN_WIDTH * 2; + cfg_desc->imgsize = MXC_JPEG_PATTERN_WIDTH << 16; + cfg_desc->imgsize |= MXC_JPEG_PATTERN_HEIGHT; + cfg_desc->line_pitch = MXC_JPEG_PATTERN_WIDTH * 2; cfg_desc->stm_ctrl = STM_CTRL_IMAGE_FORMAT(MXC_JPEG_YUV422); cfg_desc->stm_ctrl |= STM_CTRL_BITBUF_PTR_CLR(1); cfg_desc->stm_bufbase = cfg_stream_handle; diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h index 86e324b21aed..fdde45f7e163 100644 --- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h +++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h @@ -28,6 +28,8 @@ #define MXC_JPEG_W_ALIGN 3 #define MXC_JPEG_MAX_SIZEIMAGE 0xFFFFFC00 #define MXC_JPEG_MAX_PLANES 2 +#define MXC_JPEG_PATTERN_WIDTH 128 +#define MXC_JPEG_PATTERN_HEIGHT 64 enum mxc_jpeg_enc_state { MXC_JPEG_ENCODING = 0, /* jpeg encode phase */ @@ -117,6 +119,9 @@ struct mxc_jpeg_slot_data { dma_addr_t desc_handle; dma_addr_t cfg_desc_handle; // configuration descriptor dma address dma_addr_t cfg_stream_handle; // configuration bitstream dma address + dma_addr_t cfg_dec_size; + void *cfg_dec_vaddr; + dma_addr_t cfg_dec_daddr; }; struct mxc_jpeg_dev { From patchwork Fri Apr 11 07:43:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ming Qian(OSS)" X-Patchwork-Id: 14047762 Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11012054.outbound.protection.outlook.com [52.101.66.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 56A93296176; Fri, 11 Apr 2025 07:44:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.66.54 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744357489; cv=fail; b=mgnuKmODuSd5rnX5elH5xpyoT5Yf3TGODkPfVjl3wpryFi8hxMmhubh/telKCaKh8F8AfwXFgcGKdF0ljoLgOyL9uu/5kzTwmng8NRrraN8Tkyq7rV7qtZC4GlsKVcpJgXocwpPmtZRVt4ulR5ZkQTgxzOxl10xWyjA5hldNyd8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744357489; c=relaxed/simple; bh=h/a6R84tZSNGNYzEQY4fjS3S11R9XHSqC8vxyBAkU98=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=ciAQuaSraRGPuw7sDIXd4h633n1R3Eg1eA7625YglQoZDWfmmsa9GbnbiKiFc2yb0WVCvodWIOltnuOIVX3wtqzOknUX4w6FM4HZPTzMu80nwRReTjWeCMGcwqfCHqUnuiQM0f0UHvIW6IuhJPKikL72DXeMxM76Q4hsTskOhEA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=tBRb8viB; arc=fail smtp.client-ip=52.101.66.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="tBRb8viB" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=x61mNRK5dHeyZy8SkeosuS2cTPoD2gPn4RXjYyyTJMFkQ7ZmA6QWSrtwgcE7NLO8926no+fCHT2JUKwmRFvUhr4HHPFGlyXtFgHnhyuA3SY3R8wj7LdlcreGXNrOJ2WEd13OMhd9SIh7//bQq+u+70PQO7uPL6iYp5pxb2aKraEE/2EMLIWomYN518kNZbaWBkZlEy3ni6JSQMB5J7jEZNl6m4EhW2fWA797SWJxl/4zMkn9Oku14FEfStkXAq6D+6OuByRIePmYOjey2SC5xyRK6RzQJfGf8UzU/8EVSFiE2LX9FJOGq52o2q+lb1CDXRqIrvnHRe3Tn4dOmY+hZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lk0JxtcS7MqWePPyvFrhebpnHRZ+4tRIcOdHGdyzUfw=; b=bfmIvciReMDTjRWLF0F3bqJkiVFl2k81gvvf+ks7p1LN0gwzPdD5FBV/dDabN6yDZFDtdOzZdF3yJwhXmxp2NI/ynYpK9pkW5f2O9aUD5jnz2LFeYeIq3aPcXHda9NFZsLEmsXirtHZL6YASYatC3WdAvLWEx2WRHU4+9IYNPRUcb0S+qZPvgB93JGBaZXFkpvXqMlV9RSexfQTR7pMwfs3Urwr8k3eAg8j4RHlb3G5fdjbBafnwBDz8VIA6/pNtc0RNwtrq1puzgYqyNiqVaaYvoX9f+bXFUYhOvDnCzyfpx9foMPV8q7oEGEDCBzilCr0moLIbUXhitZySz5rf3A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lk0JxtcS7MqWePPyvFrhebpnHRZ+4tRIcOdHGdyzUfw=; b=tBRb8viBTWAFeGGBX4c/cHTU6bGZMJO4Lxo4KcAyxOigP6epqrxq+3VqghwtSS7bzZzB4CJwjyG4dA4tLMnjSrw/JIcg0xkwaCxg6I0gOQkyw/mb367hChJRpeRRCB4eF750QjvZ/2eiD6nAku1amcUTlF+D7s0JoYT9ZO84jB35bsq41sxlerlgbpYo29fiI0mF1m4G05h9a4BshfsZNjPc25oLH13UwRj1k+pSUwmaJ1OzmHkIrWIpYv7v78eiSn6wJaftUHNLFjOEjEkN7h2DPyp3mUZf8uwTI5xGGZEjcA+yjs0jvMKCt5qoFMOr1BbbOF/OmalHq880r4dLdA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from PAXPR04MB8254.eurprd04.prod.outlook.com (2603:10a6:102:1cd::24) by DBBPR04MB8028.eurprd04.prod.outlook.com (2603:10a6:10:1e0::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.34; Fri, 11 Apr 2025 07:44:44 +0000 Received: from PAXPR04MB8254.eurprd04.prod.outlook.com ([fe80::2755:55ac:5d6f:4f87]) by PAXPR04MB8254.eurprd04.prod.outlook.com ([fe80::2755:55ac:5d6f:4f87%4]) with mapi id 15.20.8632.025; Fri, 11 Apr 2025 07:44:44 +0000 From: ming.qian@oss.nxp.com To: mchehab@kernel.org, hverkuil-cisco@xs4all.nl, mirela.rabulea@oss.nxp.com Cc: shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, xiahong.bao@nxp.com, eagle.zhou@nxp.com, linux-imx@nxp.com, imx@lists.linux.dev, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 4/4] media: imx-jpeg: Check decoding is ongoing for motion-jpeg Date: Fri, 11 Apr 2025 15:43:43 +0800 Message-ID: <20250411074347.809-5-ming.qian@oss.nxp.com> X-Mailer: git-send-email 2.48.1.windows.1 In-Reply-To: <20250411074347.809-1-ming.qian@oss.nxp.com> References: <20250411074347.809-1-ming.qian@oss.nxp.com> X-ClientProxiedBy: SI2PR02CA0016.apcprd02.prod.outlook.com (2603:1096:4:194::9) To PAXPR04MB8254.eurprd04.prod.outlook.com (2603:10a6:102:1cd::24) Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8254:EE_|DBBPR04MB8028:EE_ X-MS-Office365-Filtering-Correlation-Id: 2867ca7b-e9be-4d19-5257-08dd78ccb8df X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024|7416014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: oz/oqUJFikDNj4lkbsD3AQmL6+ZO/+Enz/TXcbp4O+9qI1+IDOEtul2D9um6oOWa/MoP9ObkGKSUAEZkp5wPm6/oTZKTc8O+5uFySK4g+EAyNNrqbyZNFyddPA4LfNZrYgqlqeIFc/mqJv8rCz8TdlxnLWuxcp34vq2ToLiS8gfD6KcxLrCmJX/KJzlLW2RzO9aS5bMfj1r7eo/qX5wwgEt8yoItvUKTZ9wj1pmMaK2EwS0SxYGFt1u3/on4ubNKJtZVgQ6fh+VUK/5WPbltEN5puDnmQ+pQ3QB+Eb44/HbTznq3hYLmc7b3SSsXJ/VEc6T5v9p2fJSurlRZ1qFbfnR0xJ9bWsY7ar3AoGDWU8CU63a2gsh3GYxPMxDgFEK+PKTsjndiEsDHH+IajvWO/ZjJZb606VUk/D4w7XD/VCvcwVdYx9YUksJ+em091KYWlWLXbMGN0SbVM3dmC6MWdW75rjVvAUvYrNKAOoyvsF05MkDqka6NKeH0wuIYf1RGushqmtc6HkR2PPXyH53hcLAgRgtfTCa2TPIChId+f2Z5WVIl+xJiB+KFgpYUiQ/G9y85fA2fkL7nsaQwQaOSOSts+n1RESUJACw0R4yxlzvPIciShlncx5sjgtSsEE2kEVw2LiiorXkrbXBpwURmhasLy7aTIjWoK/8A+kiwL/1/oGlVZuEI050RuhRMpQZkUAG51HcMmRbUXNn1HeQdm6KtK15EVVTW5Q22gnDea8XfYzl7fyKwlGO/4essl62FlT+Wnqz+uUCZQhytLyoApFZVNXQ2JHcODOzRgjKP1shaVw8BKnBrc+nMBN14sdBtMwTWpHYzAfvv7XDjZNJeMZMh/28y0MvYbb5rPAJ8xZFU3d5zHMXP9n+SPsnygb0oCOq7MNOKbCu6hTeJyQMXfOzWpHO7+eVL85hO8Jnf3JajU3ghHz4v+9yW9RMybJFhSVEkCgyK055/+dfZCOC9laJHNwKh0DPboibKQ96v+Av1nOwoPz1SBBgZZeAjxvCaCq5THjHaSqdOqoRUUyV76E5jon1n8N03Cv2jv7SM0OzYAsFztM+XRPvxlthY3Trnfe+xFUJD0gUM5JMh53OvDgO7nhTVKmoLrZCTToTcuk7a7xlh25ppFaSzdJH5avPBNQYAhhW/ba/fQxIBo5GnzRoY1j9VjGMRo2MiZdKIzIRhIU0kRqLYxjJFe7D/AZr87qg2qpH1N63z0PNia4a4WcvbHKUdrunfl++n4oqD17TopT7x/+9xOuGuKpRyz2wbbnzavv2NiDXVBoLLN0uCs9X551cLxT97DnJXK7mtoXe1sdf260O3my4bXiyvqwqB4/RaCaZdVH83UmIvdArqxAiBnHyRaDedHqqyh33kf0XXBC7BaZMcnB3LNjFagCrvJVSIMNcqioYLspEBT41kF6x7Kqz3xKSK0fbud348IUEGGdYMYPiMqTAW6pk53jodA4a6TAMKn/cycIZGUlQpd4XJqxM9Im8UZUVKZvirSh8= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB8254.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024)(7416014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: U7o3eZm6w5m/qNK3bdOr2yzTZ8Rf2W4FBhB0N8342bPhzLQ4r9LyX/RJ81KyymG1rmx9NPb1UlCNl/w82vuZ76plGDE+6UNFYaxDK9ZUXc43wVTsWZv/z63SWyMVekbv3Eo8iLfA3xq2pn2L5RcG/KWJz8DcsGrsL18ZoW82NNqUTTaoctnlccPLvHby13vhSXxX1GN2e+fbF+NZfJ1FfYYFKCeowSmIv0hpWHtB6MfpWWVZ9/mxM6y/9H52jGNsf7pX88uu02G6z7ozlnlxfkJf6zOF+SWehRmBzZRwC3Ez6Z5LYAVLfY0LhAwMMVK/cc+SRmY7pMVeX/Pyh/MOu+SNs4tmv9opEsEeJzkEnMj9Hg18ryHr6iS/SID3KI1LSdKpZanJh9ca3GSzv/m3d26psoOTVRu0JV3RibXyq58zYMQfOsDb5cowtuXgBw/L7Bvcygz5uygus8k1x+/AsIWKVEQdI9r4756m4kqCty8zz/2m4w6m6o11GmYpZBLp0NgXuHHFSf1/28zFP4Zb1PC0OB81ZNuypzry1wtmowOsLLH/U6OeUUV3Y00dUWcRvDz/TmM3uj1K9vHWSBMNH5GbjVF1RLKFpuxe0UII1ohNeweIMqew3eFSBzeW+bwNuh+xvbpZjWKnblT4ftrpNbbSHQpm9HU0L0FNP2PyVYyX2n05O9qEXkqiLli9r5cYJh6W7Xee41VfSVP/DdQBHPDpzJHtLGseVdg7kTTMQOW915FJp/CMjwmiCo/vsb23OOKaax4cJKsSOB8Rk4GNtCfL3vrizxD2uc7iVTgGzXT9cYriSZtlZ5Tul626XGVHU7wOfWgUpXYubfrjV1MaGf1GVneH82Iy4y96dtyRXw6u1ZYP2/+3fMZd639Q2EGZiws4uGBxL1XzmEAgFZtJoRcqSI1Sv8NNrP96qRZwZnBM8JhekGu5AA3BC2r4WjO6z1gPZjo8IuNnuXmC27c73Nu64uSDWATvq5ZKW1mGxpRuq5UZ91kWSbIP3eUgLr0GkbATCMtv/V/RmujpPmou4NPXsudOQUJWgHsHV/7FcDR5bk8zHx3PuUSA3Y+5xFYufas8GsYhHXToCS6ZEw3sc+eo5/hinJgL/aDq8uXQmJhcEB7WWyS6gknt6ThX0GTEYqA2d07DUnXJ6iYTcz2tEjpByIFbzJ++zkjV42+MPeKied3QEpzjYbkeCb9TEe1e89u9aFrSH/UsbiAOlVuYvEVSeL+uBn4VmwMQyzMXkk83QhX/ZQfn4JqUeLJwPxMVPdAsCb2nekY1J6MJ0teIE7RQ5S3dqG6RroPPvWVBrWjtJplFtlR8SceotyyCb/ybjzInC9U/li91bFMmJJfwzSILwqjPPi3oTENEqmQxaqt5ziORUbZGN4rsxieCkQCuXby5he5pUo57PkIkTUsRtItHasb2r4cbo0g27Vgm2JOJa7Vq+YvSWwWK3S+pbSdC3gDpCCmM/RHfNF5zQl0GSga1aw/vnmIvPeqYnWSpAEbav4jp3AHeTKJe/0sCTtHMgjxvy3H6estg728VWMSAKQiiH0kVM4aKMteeFW48D6ifMfoPJy9a73yrpQ0Ps5Im X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2867ca7b-e9be-4d19-5257-08dd78ccb8df X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8254.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2025 07:44:44.6235 (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: SLWeJ6EliMZhJylV6eQ+l/Jo04fNoQLv4Zs9zM0Gvm3r2vkmZbbXNHw5WNIl/w83jUsQhX7J2lJSF2B8s3SaDA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB8028 From: Ming Qian As the first frame in "repeat-mode" is the pattern, the pattern done interrupt is ignored by the driver. With small resolution bitstreams, the interrupts might fire too quickly and hardware combine two irqs to once because irq handle have latency. Thus the driver might miss the frame decode done interrupt from the first actual frame. In order to avoid the driver wait for the frame done interrupt that has been combined to the pattern done interrupt and been ignored, driver will check the curr_desc and slot_status registers to figure out if the decoding of actual frame is finished or not. Firstly we check the curr_desc register, - if it is still pointing to the pattern descriptor, the second actual frame is not started, we can wait for its frame-done interrupt. - if the curr_desc has pointed to the frame descriptor, then we check the ongoing bit of slot_status register. - if the ongoing bit is set to 1, the decoding of the actual frame is not finished, we can wait for its frame-done interrupt. - if the ongoing bit is set to 0, the decoding of the actual frame is finished, we can't wait for the second interrupt, but mark it as done. But there is still a small problem, that the curr_desc and slot_status registers are not synchronous. curr_desc is updated when the next_descpt_ptr is loaded, but the ongoing bit of slot_status is set after the 32 bytes descriptor is loaded, there will be a short time interval in between, which may cause fake false. Consider read register is quite slow compared with IP read 32byte from memory, read twice slot_status can avoid this situation. Signed-off-by: Ming Qian Reviewed-by: Frank Li --- .../media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h | 1 + .../media/platform/nxp/imx-jpeg/mxc-jpeg.c | 31 ++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h index d579c804b047..adb93e977be9 100644 --- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h +++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h @@ -89,6 +89,7 @@ /* SLOT_STATUS fields for slots 0..3 */ #define SLOT_STATUS_FRMDONE (0x1 << 3) #define SLOT_STATUS_ENC_CONFIG_ERR (0x1 << 8) +#define SLOT_STATUS_ONGOING (0x1 << 31) /* SLOT_IRQ_EN fields TBD */ diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c index 45705c606769..4346dcdc9697 100644 --- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c +++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c @@ -910,6 +910,34 @@ static u32 mxc_jpeg_get_plane_size(struct mxc_jpeg_q_data *q_data, u32 plane_no) return size; } +static bool mxc_dec_is_ongoing(struct mxc_jpeg_ctx *ctx) +{ + struct mxc_jpeg_dev *jpeg = ctx->mxc_jpeg; + u32 curr_desc; + u32 slot_status; + + curr_desc = readl(jpeg->base_reg + MXC_SLOT_OFFSET(ctx->slot, SLOT_CUR_DESCPT_PTR)); + if (curr_desc == jpeg->slot_data.cfg_desc_handle) + return true; + + slot_status = readl(jpeg->base_reg + MXC_SLOT_OFFSET(ctx->slot, SLOT_STATUS)); + if (slot_status & SLOT_STATUS_ONGOING) + return true; + + /* + * The curr_desc register is updated when next_descpt_ptr is loaded, + * the ongoing bit of slot_status is set when the 32 bytes descriptor is loaded. + * So there will be a short time interval in between, which may cause fake false. + * Consider read register is quite slow compared with IP read 32byte from memory, + * read twice slot_status can avoid this situation. + */ + slot_status = readl(jpeg->base_reg + MXC_SLOT_OFFSET(ctx->slot, SLOT_STATUS)); + if (slot_status & SLOT_STATUS_ONGOING) + return true; + + return false; +} + static irqreturn_t mxc_jpeg_dec_irq(int irq, void *priv) { struct mxc_jpeg_dev *jpeg = priv; @@ -979,7 +1007,8 @@ static irqreturn_t mxc_jpeg_dec_irq(int irq, void *priv) mxc_jpeg_enc_mode_go(dev, reg, mxc_jpeg_is_extended_sequential(q_data->fmt)); goto job_unlock; } - if (jpeg->mode == MXC_JPEG_DECODE && jpeg_src_buf->dht_needed) { + if (jpeg->mode == MXC_JPEG_DECODE && jpeg_src_buf->dht_needed && + mxc_dec_is_ongoing(ctx)) { jpeg_src_buf->dht_needed = false; dev_dbg(dev, "Decoder DHT cfg finished. Start decoding...\n"); goto job_unlock;