From patchwork Thu Apr 10 03:39:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jackson.lee" X-Patchwork-Id: 880757 Received: from SE2P216CU007.outbound.protection.outlook.com (mail-koreacentralazon11021108.outbound.protection.outlook.com [40.107.42.108]) (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 45B3F1FC0E2; Thu, 10 Apr 2025 03:40:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.42.108 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744256423; cv=fail; b=riEp66pDO+C4iGtwfoXVhlamiElQmLLppQuEC14OTP73sBfwJ/+cG0g3Gphgj2nOxX0oHd/MFHLahGdPUASAWxXs1imPBJh8fZdLr4BtSZZNbePcbh3jI5lVQvCGJ0w29zBSEXW4CGusBgYiwbkhGpqa3xMXVk1XddYNgDpYJ8U= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744256423; c=relaxed/simple; bh=CrhjsVPChv72/ds63TkfWd2q1Sy2xPawI4hMdAJ3eJk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=Cvh02p9V5JWBZOp6ejd525waM2rYIREnoXMnNYi19sZZ2Ek/NtfcV8IZcF9au1MLGQOa2NNcDMdDkTWxgl8fBjEyoIwxViZiS+wZdowwuKjnw8rHWLwqKthc3uewfDsiWc0pDcfM7oylwBu/oaLQF+0HxT0uVshQGWrZoQp9fHc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chipsnmedia.com; spf=fail smtp.mailfrom=chipsnmedia.com; dkim=pass (1024-bit key) header.d=chipsnmedia.com header.i=@chipsnmedia.com header.b=h8PHe4OL; arc=fail smtp.client-ip=40.107.42.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chipsnmedia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=chipsnmedia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chipsnmedia.com header.i=@chipsnmedia.com header.b="h8PHe4OL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Nh/fDmFpuDm0IW8VCGRPOBJHDHsqaAmNMnUIWsJQ4/5NdFsMWEUhNM+B0k22kuYNvrQSujEL/hzDDTALH/7QF4GQWdpnvDeLUqbnjjfTqkeRNwDUNgq2zyE6UV+bgmDNLjBeTQev3xJ5hWi4+Hvzpt/Q9LBhn39OC+uRVZNJIDAiE8kk4U605IzqQ4s518SW1kyrvzWSVtdkfya/qrHTVc1ybmT6xpGr+bEC8O/KazMHSwLgj9Sb07dMH4JpksleT9PzfuTzeY5gam9IvqUaos8VGJYf2ZR4g9rqzVoWw6W2vcM1gKtfSRIq0Vxo8C0urijasW+A1Hvi4FEbxDJd/w== 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=IXVYk9DJqzmTdVVESoxfhz9HYIL2wzZGzXmknSJiTPw=; b=ctKJwMTdsMfqYS43sMvrhRmnNOjj98xDeqUpngLdqrtIfqzTPUzACvLAJdj52Ph44N4QmW2XQUDd1MgFpKZn4pmsxtBRmWenI1OTXPSmGv4DtyYBUosrT/fxi0IjGtIsnEkETBvGipawWef/JsMtaIYeRirx1B99tELuX0YezkRbaj7i53bE8P0AYUvjXH5IcH6Ev5iyR/jSbyzfRE/bD1Zibs7fqwkY9RtE+EEB18ANe+NBR8TIVCLdkKPBrsxnyez1r84qLv0qWwNegkqATR3ARq4/+FdlaZ174kgIbgmMnfbr1s7KMI3ZJf6aDozUp1gY+0onB3TvV3Tajo/vWA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=chipsnmedia.com; dmarc=pass action=none header.from=chipsnmedia.com; dkim=pass header.d=chipsnmedia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chipsnmedia.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IXVYk9DJqzmTdVVESoxfhz9HYIL2wzZGzXmknSJiTPw=; b=h8PHe4OL5vtodFgzNcaXnjn+YXA176B6CipPZTyPeHo7Nmy202YrENABqjiTC1Q2H8LqHKvkCxs9mXi9BD1cZUhzW814/zHQ2dxAh7T5T6+47FMzOgpOLNEhuanEZdOcMK99AjVaf8FGy8KoTnEUG2p/I/y0EMG2Y4lDRGQUJdQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=chipsnmedia.com; Received: from PS2P216MB1297.KORP216.PROD.OUTLOOK.COM (2603:1096:301:73::13) by PU4P216MB1439.KORP216.PROD.OUTLOOK.COM (2603:1096:301:ce::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.23; Thu, 10 Apr 2025 03:40:12 +0000 Received: from PS2P216MB1297.KORP216.PROD.OUTLOOK.COM ([fe80::d095:716:2d14:f386]) by PS2P216MB1297.KORP216.PROD.OUTLOOK.COM ([fe80::d095:716:2d14:f386%7]) with mapi id 15.20.8632.021; Thu, 10 Apr 2025 03:40:12 +0000 From: "Jackson.lee" To: mchehab@kernel.org, hverkuil-cisco@xs4all.nl, sebastian.fricke@collabora.com, nicolas.dufresne@collabora.com, bob.beckett@collabora.com, dafna.hirschfeld@collabora.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, jackson.lee@chipsnmedia.com, lafley.kim@chipsnmedia.com, b-brnich@ti.com, hverkuil@xs4all.nl, nas.chung@chipsnmedia.com Subject: [RESEND PATCH v1 3/7] media: chips-media: wave5: Fix not to be closed Date: Thu, 10 Apr 2025 12:39:58 +0900 Message-Id: <20250410034002.88-4-jackson.lee@chipsnmedia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250410034002.88-1-jackson.lee@chipsnmedia.com> References: <20250410034002.88-1-jackson.lee@chipsnmedia.com> X-ClientProxiedBy: SEWP216CA0051.KORP216.PROD.OUTLOOK.COM (2603:1096:101:2bd::12) To PS2P216MB1297.KORP216.PROD.OUTLOOK.COM (2603:1096:301:73::13) Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PS2P216MB1297:EE_|PU4P216MB1439:EE_ X-MS-Office365-Filtering-Correlation-Id: c2e7d321-b790-4712-cb5b-08dd77e165ff X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|52116014|7416014|376014|38350700014; X-Microsoft-Antispam-Message-Info: oJtF3TIm1Xypoov6DGbL/JowTbboFEYo0A1jZdcp0pmhUfMhkSwudDortGqoRMZHMlHpGcoBIlw4U7IrYMFXAlzWuYcYYtx41bz+w9wJ01nEYdV6tJDpx2jFr+ZK6LhIp9SIKErMY2wfFv18ccyJflJoA0H0P4AKKFbGJxg1/cphvAjVYu/1V0MreYKTl1flxM44ie30eoPCHtaw2Nl6hvPLif3aSsHjqHoUDlzLtr5tNGAiMS6EYrmu/MlK2fBJHWWGEyrOhceYGoijAnR3XtsJmiD9Od5mfwsnkbwRAtAZ0+LNvWSwpWdH7cNhdxA+KbFGakPdbG58x/TC3+iOHLmSaBhxT8pOtSHs95uchrNU2T66QZjYmBOVhd8Ex9Bq2nLTY8Dxmwii1JFF31jyn73N4FskYMjrjQDJdpwGgF8Xj/DDSlwek6uLez68+4CfdbGCk+Y31Uwg8bXxCx7SaagsnwWdp+ZcUs8gxTnqnNklToJKHgBPt/TMR6NIJbbvQkMJIBPIIMhCNR3lQs7HHBc3yX0fFIcGHpzsSlaZzAQRihWWJ4aHwAIs1hmLdii7SXl1JVn+ByWBeUxL5h71MDa7I4/hNErRxjg8IvRjWSkI3ywoDdfs6d5/uqq8Tkk7o9ATKY3IIlHeXkasSqusgLPMOujvaHLGJfvPSS9fWmIYZAU8QSS9F3G3lLvStFAF5R9xQ1PrcBDClUNCKieEPPCD726r14ZD2idWc79UOGwkH+meYCM5I0KL5qNiHKKbSXGusqVvlqtJ0DZ9ASlDMBtKZJ2GkZb+owXiVl96dDafPMqlCyhDdBP+vcUMXCLBdETKWgyNLLmGdBBydLYs05VF3Jx2nFczHGP0084OzKDIINnsMzJ65lUIiYGM+jmxtTim109oQu4M9O3Osp79e78Mg2CeNgjJZFzF1hrhqCZMEzxbsaNMxpQGX9HfwSYKiXbttzxSDzYI3yXb204EESkU54isHv5qwddWJO9pcF4cW0Jvd164wLXQyy0GO+/T+2+csnUGqPlnE0AYaEbZcCS/rXXnze/lY90oG0AfT/naovsLpS0cjWUktzGAAKMk9kunOIbrmjIMIFQIdK3wTLsZP7C6sJeD+bZrxSfbCc4v332ymkD+WHKsxC4NQYQKlxfpMb3NrEhfJqYkCDtnO9/MP3oS7hhs5VJ29DO5PmiKH3f43Vk7PBtWXSFImSHDyxDnxtYAC11UhqRnToR6obn+92nchLZGfGp23RsnN3EJbJcU0Te/sq2pIJLD6KVTdHD1rsdnRt9VdzoCW8NdRhnpBAsvT96jThoJRRqeX74OY4gk3wfH12N5kkECNhu5yCMTcEPan1r/5G0TfgJxZU4pSsc0HokFHwZyVzYw/98+4Yo3w5f6U6S06JM4B91VCFDOtqX8io9XhdsiYLvk6eg+R7+TTO9lo9t0sHVYhq38+K29U2j2L8RePPXh+sgY X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PS2P216MB1297.KORP216.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(52116014)(7416014)(376014)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2BOw+mTgV6NCUQD0Q1vwVHpkRLuhJPcccuvhHC5mr2IyknCq1au77EteA9thu5qMg6qf37H2SSCmkOTu3ocAWWv0NhBJUl7mbPHnI0terzszl0DNYtVsuMzDtkp92K+VMda1uqm51YVHoB9Q+MnKmHr+zSTNl+gicbavhqZg1Y3fQ6avCyQPCfyKQMWWASZCH/2da91W92QD390vkwXasdGjP558mzL8Z9UtEIe0SZU+Hs57hLvEWNedM+VY8vOVRy5anAXJA73B9qHlt7WKvxeu0LdE15LMEeXwNNd4Wr6NBmPhqjRDIt/3QRPge1FEoAh3LrNTCwU22ip3UnJcAByuT6ZT4EmsQKtX5oPN2j9bw9CNhOOGmljOVre7AiDB+ADHXNmj0tzPm9jcPtgaBop/nf4pwO/TxGkEVZA44s//aiQLchCj40UCc6r+FxGFWU7XKwsAK8RzJuQZLQo3ODM7v3a64wS2gl+5I/eIwZQjohBbSOjgeWmvMgpdDhS0BUgXLD2CeVApEmTTL45QOLIApC0z63qYwX2dpkvw5up3+wNnytYt1zJV7KnD2D/qjCdBVnQkm36yj+LQzuSHYW29/RZ/+exeVh5YIkcHswnvkvlKL67SPJ0u5KnQ/UDT5JQiHO62TEFGZiKcNtv6F5QeP7Zw8VF/baMtyjAKI5DD5Qh6WkfXMGPlBY8ALDc6VWtGATlrOtj//OCaHb7Y+1uTevMnAAqXFfYO8OO8aCTbr5hyvLu6M+DebHsW0C79m+ZthHJx96ppGn/ZWJMzGZVmHW6Daofuviw+XOM9gS1Ve7ijj2MZXF1HZcSzqx8Xykpuil3+fB97tsqmjBZ/ZWXuNHxWe7gBjFL7f6Hckb68nefMwxUDLwRodd2Uz9SzqNWSGQ/M2bn/5I2binlIVxAuMUdrKVvwmAvNTBf/0TxLMpu/arrq0rlDFAvBNayPiY0WvSsatkh3Y7dT48ll2EWgDPi4YScTevngGHmL2SlzpJhTT1O7GKmfhR/H2DYZSd5baJthLOqiNMZkyCbnvpkR4yUgWmxYFBS43NhSDXswcyoHsNYHLKhnKKEatuqpcOOpRBTamx8QI/VoyQvGA/fd0B4gsv7R880cIBPrMhbKxf8A/zzBicntPKun7PA8i9baFCtEiTJLLFqzEl0hN9pF2tUZGTOtuijEES4E3PtKgWy5JyFDVBAJ0spYf9+acIFVjsBG0B1Q75cyC+jwZOjCa6YcCd4N1gADokZGxO9JMD9QyWPuMDplAM4ao1iT0azwNnjNjxgJ+QDclQMZNXrhf9f7WxBgs/NWZVbWI7dbk04X/8zmi5ZGfDCbJzq89mOiR8iqvCnORRnNo4vTaMaGW2LcBgMJ5X+tOSFuOqa/AU31T1UvQNwOwgfCwPTYH1TKcwDwNsOCXZD4qZ1AZb0RH5PtD80Cyl9pi316iGO1SFvb8a6nX1eyHDHS9lr5Yn3KcGD9942fnNYTmk12SdY9KIJgbi820atI+M7JWAwTIJ/s+LLPT1+xrZDD8YZHT46JGKf8KWF1wcNKbcZiO7+lQIcTL0i4A2lXkoeomRBjhG3x4c9gGjJRfqOygyjPQbNmwZd8cF6qBYBE4wnqMg== X-OriginatorOrg: chipsnmedia.com X-MS-Exchange-CrossTenant-Network-Message-Id: c2e7d321-b790-4712-cb5b-08dd77e165ff X-MS-Exchange-CrossTenant-AuthSource: PS2P216MB1297.KORP216.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2025 03:40:12.0421 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4d70c8e9-142b-4389-b7f2-fa8a3c68c467 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pEaTk5h7oC1C5SQVa3vSOiVx0mk4Qet95GkQGPEoWL4koduisNljwkTaQNnnRo30juxZVe2fMoAzamo8EvUftR20pTGpfV4hRyup3CFwErg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU4P216MB1439 From: Jackson Lee The current code was to wait interrupt if queue or report queue is not 0, but since applying the performance patch, input and output is not any more synchronized. So even if queue count is not 0, an interrupt could not be triggered. Signed-off-by: Jackson Lee Signed-off-by: Nas Chung --- drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c | 6 +++--- drivers/media/platform/chips-media/wave5/wave5-vpuconfig.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c index 192556b91aaa..e0f4b11ee464 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c @@ -1481,11 +1481,11 @@ static void wave5_vpu_dec_stop_streaming(struct vb2_queue *q) wave5_vpu_dec_give_command(inst, DEC_GET_QUEUE_STATUS, &q_status); - if (q_status.report_queue_count == 0) + if ((inst->state == VPU_INST_STATE_STOP || q_status.instance_queue_count == 0) && + q_status.report_queue_count == 0) break; - if (wave5_vpu_wait_interrupt(inst, VPU_DEC_TIMEOUT) < 0) - break; + wave5_vpu_wait_interrupt(inst, VPU_DEC_STOP_TIMEOUT); if (wave5_vpu_dec_get_output_info(inst, &dec_output_info)) dev_dbg(inst->dev->dev, "there is no output info\n"); diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpuconfig.h b/drivers/media/platform/chips-media/wave5/wave5-vpuconfig.h index 1ea9f5f31499..4ebd48d5550e 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpuconfig.h +++ b/drivers/media/platform/chips-media/wave5/wave5-vpuconfig.h @@ -59,6 +59,7 @@ // application specific configuration #define VPU_ENC_TIMEOUT 60000 #define VPU_DEC_TIMEOUT 60000 +#define VPU_DEC_STOP_TIMEOUT 10 // for WAVE encoder #define USE_SRC_PRP_AXI 0 From patchwork Thu Apr 10 03:40:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jackson.lee" X-Patchwork-Id: 880756 Received: from SE2P216CU007.outbound.protection.outlook.com (mail-koreacentralazon11021108.outbound.protection.outlook.com [40.107.42.108]) (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 2900B202F89; Thu, 10 Apr 2025 03:40:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.42.108 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744256427; cv=fail; b=PM06wJ8AJO9IHojLVx1muE42L8u4p7AZH9QmRrEE4x4ok8qv4IOcs9UK0aQrhaeMeZw/sXn403PPAMKe/cO8lT1afTjn0BhxbqlOhOrcsBZqr/oCJ76KBuD+9SdDmWwU60AjWpU/zn0CHNzaP1QZw5+b31Jls14u6p86/FJkGRI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744256427; c=relaxed/simple; bh=AH5fObUc+zqLV+I2Jr6qGKTDpLnptyB51QwBL//qg3Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=V0PSIiEkuU5I9HpFf3thQOOv+SGS48o8ucXzRfspVKx6xC2YA7aJvMUTFpC1JSc63N/JopPkx0Rl8MumQUMVkHtvPWahFsSjEhJ1NOv9Hj/VY0IBfbf1+4C8slfe+pZxWDGTCdukiVk+3KXzPr9q64bpoW0n/6drcUxqzbvm5Ys= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chipsnmedia.com; spf=fail smtp.mailfrom=chipsnmedia.com; dkim=pass (1024-bit key) header.d=chipsnmedia.com header.i=@chipsnmedia.com header.b=XdRasTcQ; arc=fail smtp.client-ip=40.107.42.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chipsnmedia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=chipsnmedia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chipsnmedia.com header.i=@chipsnmedia.com header.b="XdRasTcQ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=p8fz1RHxJOUhlKNbG1DrKMQlTFt9pVzDUyWgRo3EgNhQuAmRxMeWrY2emy+gefKgh4xC/ZJ7yZZEieV6TiqMmkpNKU226fqVj/uqI9sG2SSNn1FMIXP9iBgsoECvaXqKa5zsuqnhnvmuME2KCklTjwoKQw2hPMC7+wSFn2leCKHAZiVHUfR5nsKfCzH4Ze0mps2wGxeXEL1YVDTM5jTlVdvFk4HsvsZ+xWntxso9K71vj83Fp8DXNKDsU1OD55jCARUAjYYpYhFy3KPYi6TIH3qYsQ7Bnltse4EBbJ9vBLM1bm5lu1eSL5FCWwG3gESDk7LCjXTHINP2HnEEHbEFPA== 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=ggZ2ztAzqLB1oq/qfR/EnIqKJxoc/27dmch8qEAQFJA=; b=xfwJjNzM3vi4ZEggpAfPELfFNUiyBQqxL+q4/DERW8rycO9slb7RFXfgHsOKnPtplNNeqFh8rTP8vDeH4843rLS0t6nPPPnDEMmYev0yxj8UgtTTnASOeyOFCe2QpmmSqorJxJVSwXIAxLHlU5xQ9CBrxmdQcFqlcxU5WeUMm52X3fQUL6SNddfuYaATWuSXnAhStxgLMEoAiB4Gk8vPu3u+gY5lgj3cmg7AwGGIOexeevT+englGrciCFWlmOrLS2kMGUt6l1koY93gyJDk8BfxvFe+CUtwUMZDkexWhTtKxT2Hc7ONurHzCKse3xUoS0GEcyhEjHn2aQcABwrtWg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=chipsnmedia.com; dmarc=pass action=none header.from=chipsnmedia.com; dkim=pass header.d=chipsnmedia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chipsnmedia.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ggZ2ztAzqLB1oq/qfR/EnIqKJxoc/27dmch8qEAQFJA=; b=XdRasTcQKO8HTUz/CF9IkJAl1QPqyD5NyzdJoU/EPRZMxf5oT9voGna2u9/l83nWdGTGMq4RpP1shNWnjVYC7lTjvqMsHq/MaRmAFOiroKuQ+bmdkHZa/q8S1k5ST4Ily1hJS+wSaFsaSUqpweXgss8JPcL1/3svLxVkl7ftar4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=chipsnmedia.com; Received: from PS2P216MB1297.KORP216.PROD.OUTLOOK.COM (2603:1096:301:73::13) by PU4P216MB1439.KORP216.PROD.OUTLOOK.COM (2603:1096:301:ce::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.23; Thu, 10 Apr 2025 03:40:12 +0000 Received: from PS2P216MB1297.KORP216.PROD.OUTLOOK.COM ([fe80::d095:716:2d14:f386]) by PS2P216MB1297.KORP216.PROD.OUTLOOK.COM ([fe80::d095:716:2d14:f386%7]) with mapi id 15.20.8632.021; Thu, 10 Apr 2025 03:40:12 +0000 From: "Jackson.lee" To: mchehab@kernel.org, hverkuil-cisco@xs4all.nl, sebastian.fricke@collabora.com, nicolas.dufresne@collabora.com, bob.beckett@collabora.com, dafna.hirschfeld@collabora.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, jackson.lee@chipsnmedia.com, lafley.kim@chipsnmedia.com, b-brnich@ti.com, hverkuil@xs4all.nl, nas.chung@chipsnmedia.com Subject: [RESEND PATCH v1 5/7] media: chips-media: wave5: Fix not to free resources normally when instance was destroyed Date: Thu, 10 Apr 2025 12:40:00 +0900 Message-Id: <20250410034002.88-6-jackson.lee@chipsnmedia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250410034002.88-1-jackson.lee@chipsnmedia.com> References: <20250410034002.88-1-jackson.lee@chipsnmedia.com> X-ClientProxiedBy: SEWP216CA0051.KORP216.PROD.OUTLOOK.COM (2603:1096:101:2bd::12) To PS2P216MB1297.KORP216.PROD.OUTLOOK.COM (2603:1096:301:73::13) Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PS2P216MB1297:EE_|PU4P216MB1439:EE_ X-MS-Office365-Filtering-Correlation-Id: e01d62a8-bd10-4052-8c78-08dd77e16674 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|52116014|7416014|376014|38350700014; X-Microsoft-Antispam-Message-Info: 1fXxEcn2vvu5GinGrjzeRP4PfKYk6T3/CTf9vfoMLZQG4iiqZo2yXX5UGStrqJ0gLdjm4udMMPVfJuA5fROSu7uNWRZtSA+8YdmjTY9YS38rts3UEulB6WUPSc2diU/6pq92FBFx4DDYg02Di7bFQ6CvCISNgbHd2RxlmTXTF6+5V00m4+P6TGysvK97phnVThHisCoN/rH5m78+WVRUaAzpTYGG0c8CQaXn/zhYGyQd8b5e9u7kSJefSxvfiGN6Jo2tp1AKxHktts8uRY47pW2+jkvRjv+FVWktYIp8rb5Ebs1wwoE4TKss7xavQGdBYKlJp7La/cChmvdtJf59egBfWQRj0/dmg7X/sE8ARLgwOO6VcuH7fNjmQyz4CfKvGspM5s6jYGdZ3ETQAexhtOFeZFzy/Cfxq8jdUm7y5e5TFGcWfzOyM/ikfteFf4M2E5n1yuQCRh4/WHC22NnoKRIYoiFBWZLh7swyUSD3UuH9FgpcJ49ZUc36vEGuxSTcfyHUtRS402bwNX3Liqadf+xW9RLFMLfwD9/TNpZVU47P/Iew8t74t+G+K0ubPnKYIFBD0P9X8zDC5EXWc9yQlrRfGf2lGgN6Ycn3AqOqmWEjnFP+3chktJJjplJeHA8ihJ+Bz9SVHqXZoi36G4n/pjhChJvWwkmEOvvLKihf6iZFAHS5kJEA6yf+MJ4OLJ4EPluh5dDvKBUaYZhMDW2NwcKFDY9874bhLL9c569vRTYq+N4W8K/v73E2NU40+iZRBPSQuCNeGSFLSP/fXMzJD8XkiTNdbZSzQx0jnuz7Gp6At4nL6hgXxibVJ7DI1s/JkBw5TY0iUq24Zhmu7TOnlkXllADALF4yzqM4Js2aSIFl3ek14oDJtarqPm4GTe/1BbZP1EZTmkn3WGoj1cuU1QkDjkcN1miu8TK7FuHMBN3IxUip6it3LxyrQFCF5XTi3qXfwAZy5lyBQ5Qem/KcyFyLBA2JpLJeUv8rxhBHpeC2SAbiuw6yevh5lyvS85V7a8d8fqPJu2bST+HTt+++jvzN36CxnV50+TYTEVaMdyTX8eJt/u/toWGGMurkFw5PVaqpS9NPKwdyTodCMtaLGDh9Vszus30ZiEMzKGoUeBaYBNvvFSM574N3xitikkfHHQrxo3agPzn3wdPOtbDcxwFgOeoSEZd3bRPMtreVQ8TecnoRCY8sBUqnLsPb+RLVZAYDHhRoRLnYjuLh5u1xzjEv07j4YiQWAZmfegKLQ2E/Ou/c90ldwY6USlCzDwQUWh9E+EEQdHTo8BYBvooLfRCZKbN5G/+BRrvwU4xAea9OWolXdLYiJveMI0IuBXuHZxY9QaIv1eS16urMBIioeHhH1FDKCZ9x7sQfz9kvwe5BKTdXeVWb3lnonylmqnUyS/rLmUCFMf7tlb+5esW3hAQMfcQ1QmVoF3/+1tS/DCkFZZcHv4V1nsKA4Q/ElZ/g X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PS2P216MB1297.KORP216.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(52116014)(7416014)(376014)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: I6pu8RoXW2ux1Mzkq18XMc91d2IqWkbyTeiO0eoeerUxQ2n3kXDRT7MHDAAyYYgW6IuDGC8lLRYfUWyYvNv7HJi6gyP96UMq414YfiLXVIcVJ/kmeaHBoB4MvamDpSJbQK/OQu4bXRZ0hreEuauHI+iPtyzdxygd/GMmTF4YlA3+bJObwlKew3n/gadeX2EhcuQQ5gNSo/D2LEhKb0A7s23Pl/btccfYD8KMpxj2oIBsGs6Sv5Tfd81hFqqTDOrfwPopPla6xg2v9Bll7rJUR1hTfdd1zohUpf6FoEkBERdclhCoHKFVAqTZQxS3nOIYGLoK+3k7GoMiJEvwU79e7jIZaBft2z4EEVPs+ilNXBlT+9n/DW+Ankeyvjit7JPKv4HGraLfUSRiH7jVNxje0I5sthBfCrTxYHATyNQjJlB9C+05PHwsZL7dH4XwXCEqP0pHGhnqsCMM8uWXiD5tqSiEaoI5s1PLZgcTnODMbCK64qdHn3i/fYdvRKyx15+2SceAisrMXn5bf2lUiD0gL1jnZdhIx9cd1zbyl8hsFPiZkHbEIKwxp4EkJyDgcFLJw1s7NrWd/NTtnsY7CGqR4jawCNYkhHDVXfNT4bKpUVrjDp4nfYHeDOCjFOpGCPba6RMh9a2RoliNqosRqOlikbzwzssdZnbvi6O448rb8IWF1vJ2Wo85Vb3ax16WrvsgDIWwHTfE++jfjvJM6LBDa/2KawOLvh3TXR1le3apPKmrCh1vbjtW+k+4riAGotAiMAI3upTh+WKwQfS9kT9y28rUUiD/25eh/T/G71EBhGk+CvxAhh08YQ7rvfk8Xr08WcWp2VK9XWuQs+PN6HBf3ZXbN2d0/rof5o7eq1D8G2Yqh/1EpkZobztrIb2jAj8c5c2xHIe1QyaWe1E9bMBjJGuH/cAN0NGXR/xStL09e51ERjZlyPicsgzGuELXSWdfAXGPEba5W7gKMfBKimf4ppT2NSipH5RVInPqyXblYPkQJZwnrr6aSiz+u8pSF2gkH8bAFTzeaLdaExBGyB3XQkvU+nq6t/UoY2USfVhfKu/oaIrinF6wNP9BdafVmdDeAyYNyx+nt49Nf7Us0XjtRmAAsLDFg+JaaTBPUzWwdCi3RWLtPHE/+gBmVnVQzalhxNsaOLWiTgwP3AwUkM6TeAj6VTpcUT3P11ZX94FyGnj/jjyqWIGdmvP8KXa6PyXXCsUy8+lWoy6JsDuDsET6pbh5DQfpslSMVr3GyMKpWMnixS3rpBcUcracEmrG9aMnbAXhYDuBb1Tx8FtKXHHAnDSMOKo5m9xboukXPodPerzNTtEihn9Kh0aTJ/3aOvZJmSM80IW7mA0Z6wminqTGJAGGH2k0HQS/j56udQaek3rfKBStq35qhJi1Hy6mVEQ3TM9i0NlrW+GO41hoyH3aDVySG/tLgn1YuRHD6HWy8bYTNN0vDr8bwuDkvibAcSe1VtJe7iD9alXWdcRTZWBurOFl/MwN4t4DCqWSaUCVHttEeWuA8cT2n0LCWXOvco8+1mvV7x9lpMdcNdHD/MBSC2Nf+h03fX9lOrhVG+G6r66lhOkth9wii0e+Rvqiuf/kjBv3eWgtSIQQlJVq1xW2Yg== X-OriginatorOrg: chipsnmedia.com X-MS-Exchange-CrossTenant-Network-Message-Id: e01d62a8-bd10-4052-8c78-08dd77e16674 X-MS-Exchange-CrossTenant-AuthSource: PS2P216MB1297.KORP216.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2025 03:40:12.8269 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4d70c8e9-142b-4389-b7f2-fa8a3c68c467 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: DRQOhDqnsPrPbd75IdukdwFztDGRBpUEeaoIYwcSQMslLDkhitMPSMmJPWTQT6o4qxhC7nbKLlJW5eSRUfwDbLY+InBq4Epd9gNfbauieN0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU4P216MB1439 From: Jackson Lee Since applying performance patch, there was a problem not to free resources, the root cause was that timeout sometimes happened after calling the wave5_vpu_dec_finish_seq() when application was closed forcibly,so if failure reason is WAVE5_SYSERR_VPU_STILL_RUNNING, the wave5_vpu_dec_get_output_info() should be called to flush videos decoded before closed. Signed-off-by: Jackson Lee Signed-off-by: Nas Chung --- .../platform/chips-media/wave5/wave5-vpuapi.c | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.c b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.c index 68d86625538f..d7318d596b73 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.c @@ -209,6 +209,7 @@ int wave5_vpu_dec_close(struct vpu_instance *inst, u32 *fail_res) int i; int inst_count = 0; struct vpu_instance *inst_elm; + struct dec_output_info dec_info; *fail_res = 0; if (!inst->codec_info) @@ -229,11 +230,26 @@ int wave5_vpu_dec_close(struct vpu_instance *inst, u32 *fail_res) goto unlock_and_return; } - if (*fail_res == WAVE5_SYSERR_VPU_STILL_RUNNING && - retry++ >= MAX_FIRMWARE_CALL_RETRY) { + if (ret == 0) + break; + + if (*fail_res != WAVE5_SYSERR_VPU_STILL_RUNNING) { + dev_warn(inst->dev->dev, "dec_finish_seq timed out\n"); + goto unlock_and_return; + } + + if (retry++ >= MAX_FIRMWARE_CALL_RETRY) { ret = -ETIMEDOUT; goto unlock_and_return; } + + mutex_unlock(&vpu_dev->hw_lock); + wave5_vpu_dec_get_output_info(inst, &dec_info); + ret = mutex_lock_interruptible(&vpu_dev->hw_lock); + if (ret) { + pm_runtime_put_sync(inst->dev->dev); + return ret; + } } while (ret != 0); dev_dbg(inst->dev->dev, "%s: dec_finish_seq complete\n", __func__); From patchwork Thu Apr 10 03:40:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jackson.lee" X-Patchwork-Id: 880758 Received: from PUWP216CU001.outbound.protection.outlook.com (mail-koreasouthazon11020083.outbound.protection.outlook.com [52.101.156.83]) (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 630E11F12F8; Thu, 10 Apr 2025 03:40:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.156.83 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744256421; cv=fail; b=dfyEyN4HKuyjXu5gdMgaid3APcy1/45BeUznoIJNRgLvSQ6h6dwAcZC4e6K7L54O3qZF5Vx8Ydu7uJIKu0rQSOaddZ0p4Jehiu8DMvw+UHDwT5AZ9JWxidopec3550jgJDqaaK3Fs+x4cBIq94RQdTyNO9oiNby1szR73O4ujuc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744256421; c=relaxed/simple; bh=xg/PA/9gRUsESu99tTSwUeXsaGFNFWmJRfwJNaKyy9Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=BJOu81y1OCISPws9lhe5SddhatI94bRmgYhRNOjsVqpvtBuhNKRwVPDIVAEm3IWAuDXdsGj6AsrUC9QcnIJZVg1vHUxWjy/QSI7UFAgSVOuDJmJLEujNcJAqCkU0onifEMf9VZc1H1bAOYFZGwQkx0LGnXrEyC7BwZh9o5EJtC4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chipsnmedia.com; spf=fail smtp.mailfrom=chipsnmedia.com; dkim=pass (1024-bit key) header.d=chipsnmedia.com header.i=@chipsnmedia.com header.b=Z00Isu0p; arc=fail smtp.client-ip=52.101.156.83 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chipsnmedia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=chipsnmedia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chipsnmedia.com header.i=@chipsnmedia.com header.b="Z00Isu0p" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DcQ06B4Sw+E2x01bmYL9FGDRRgdYWFZdk5i8X+oF7uj1ytURzd1kVZr9aQCVH2o0arJqDlB7s5eGCoL0T9TL74kZ65f64n/d8Y2u4yUOc+NTBUC/bYIR7rEG8INVhnGqd9PTIM79/hp0unT8em5rAZdTYogJ+tuOTfm8Pc1EimDpIKBZYJofiggdbqFMel/oJDTO8EmrLTo/5J4OOIIJgakwbsQ49n2kIWG6GTHUl27uyKpLvkkiMjDk48VTM3DVaOJ7g3QoTclH3VrcGbnBlRlfJrYzUwCIYNqMWa7eIn9iVnrgedokR/+KZXv0zxns3CrdyLfUXwum+8xUHNFlhA== 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=0FT1C53ahmCMpbiN6CEJD58lrxkwXSk8IKWpcgRM+nM=; b=k0H8v9EaMJLoShg6RJ28AM21HbBB8fZuGLFPuggAIvjYMAf5C6sIXVKU/BFF6psUHTyrgSDVeJ6h7Wz/WACY9EZyElrcypvKE2gGSNLRHjLSpQtGj+u637EVr7u1CRi2RNAQh1wd7tVrVjRMp0syW1vijYXmz1z6YJ+QuaN4ru/AuvouMvD/JjB2hh8nBKedXNIN+REPSTbl/LTIhJjh9tMPyBVDk58zLqdwWoWEPpbQyx7tiBBU8R4FLjfEAzJJnivdz0KPhGax+Ps+yZWStSKSFpV67WaUBgMKX6AzBrTSB1ZH0ktiQpdQk5hW7RG4sHYGdKEFcpdWrmNrQK+kVA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=chipsnmedia.com; dmarc=pass action=none header.from=chipsnmedia.com; dkim=pass header.d=chipsnmedia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chipsnmedia.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0FT1C53ahmCMpbiN6CEJD58lrxkwXSk8IKWpcgRM+nM=; b=Z00Isu0pTuTbcz1NxxFLlQxwqFAzwrXBcxhiSSBFVRvk/8bPRdoth3ow1RCcPI0MFIP+FCbEwoMrCq/t6giPux6N0jrxQq1ZdL1WlGzZcjAt/ws3v0YBvzaX2tznuPZYtkTsZTyuQ8voYLSlvrbI3XYpYmBO1pxP3O1C6gpLtOI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=chipsnmedia.com; Received: from PS2P216MB1297.KORP216.PROD.OUTLOOK.COM (2603:1096:301:73::13) by SE1P216MB1318.KORP216.PROD.OUTLOOK.COM (2603:1096:101:15::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.23; Thu, 10 Apr 2025 03:40:13 +0000 Received: from PS2P216MB1297.KORP216.PROD.OUTLOOK.COM ([fe80::d095:716:2d14:f386]) by PS2P216MB1297.KORP216.PROD.OUTLOOK.COM ([fe80::d095:716:2d14:f386%7]) with mapi id 15.20.8632.021; Thu, 10 Apr 2025 03:40:13 +0000 From: "Jackson.lee" To: mchehab@kernel.org, hverkuil-cisco@xs4all.nl, sebastian.fricke@collabora.com, nicolas.dufresne@collabora.com, bob.beckett@collabora.com, dafna.hirschfeld@collabora.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, jackson.lee@chipsnmedia.com, lafley.kim@chipsnmedia.com, b-brnich@ti.com, hverkuil@xs4all.nl, nas.chung@chipsnmedia.com Subject: [RESEND PATCH v1 6/7] media: chips-media: wave5: Reduce high CPU load Date: Thu, 10 Apr 2025 12:40:01 +0900 Message-Id: <20250410034002.88-7-jackson.lee@chipsnmedia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250410034002.88-1-jackson.lee@chipsnmedia.com> References: <20250410034002.88-1-jackson.lee@chipsnmedia.com> X-ClientProxiedBy: SEWP216CA0051.KORP216.PROD.OUTLOOK.COM (2603:1096:101:2bd::12) To PS2P216MB1297.KORP216.PROD.OUTLOOK.COM (2603:1096:301:73::13) Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PS2P216MB1297:EE_|SE1P216MB1318:EE_ X-MS-Office365-Filtering-Correlation-Id: 390bbf4a-fec5-4d84-122a-08dd77e166ba X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|52116014|7416014|376014|38350700014; X-Microsoft-Antispam-Message-Info: ZOP86SHdT29koPF7ZdIbuE1TYlQXb0foTZUulTjoOOr2dSLWEKGoCkq91PcVnb8x7RFsTHLjxkB7nDS1/bmxW3OSs8rH7TjBW7yA6KTaGpQLgk3VWW8UZ+dZ1o7catjt1OhFjtGSj37ha96T5OjQQLSTkr/LQsT9nvl54MFBZpvWXZpmWsXk1QOesuj+C/HHaelxqzqFobtEbw9hoGARO1k3T3EoOO/KzED7cGphcKl4SMGs/zQwZoPmtvV17kqTz2d4v3Y7FYsKwgRVLWD5iGz3rqzwcs67Guqgn0KFQzKAenBbRPoaLg8En+FOfd37YDF7y+4OALHnBpogyzZfoNoei1QC2/1ZdU09CqPr3sxE8xmmVwkBy59lqMGe8UZ8w3RMamHWhd7wPm3emNzSwuaHWWUH2HvPJu5Bbu/KLZhb9NwVDsBXHXlBqTgjq9VnPyQmfJKO+EOaxnDE4WcjJ+T1Y78FLWCH5Kl1pPiYjC+/cQtZqCh+GjDwLF96ohD5kSCTCbM9xkSD13q/yMrsJpmc+0v4xsDg1QU5U64x8do0JC8wx4d3QD5sZfLNBqpW8kK8IlI2cucAHaHQ6gGmrTVWeh6uwabbkC+YBUAtpE6yYNoBdvLqADsgTTJwVnhs8ZQzIs1CKL3ihHiM3LsEl63oJ/apsZBtDBzXjHl9GFjhqw6Nc65vNwdvwNMWQQXsdT0+jDnUQtPnlR7oKxHir3k27ZI0wW8nHOvSCq/DKa9vrVXE2yatrRBCtZSJWpCvJl3y/uYCb8ZRdqJBWi+i05Cs+ZtAOjOrpLbjQwt9sbRCPwCAaoHHu8APO/BNP+y/7hCujhPoCRDApp9lXXsQO139wfzJlT0W+QzUNeBmqJC8MISMfBnRf69bBAmfuNlGevOi3m2B4iLM54VQMRryFuyb0+udw+l8i2h3UwJ7hWhyzmEfm2J6+cKjSEIukDD0PbF3gwrBGjOPRfXPeeODcc8HbjKth9zjwReu1yno9E6tw8I8M7LO/9qQxYD3AfHSrd4oNSai3oNu/dzoEMVH5NJxHNjLV3ZUtX38ryA7DNn7CFMtmeEhaHqt91y/ZyzPv+AeHq48iRsWHZzQP8mh+IDi282HOOuevQx71KLOantX4m3olszYtm7yOxosP4Es2z9ngtp42k/3lyArnt5Du84sbr1iWohVTz9VmyAVjo4DsUVV8yzQa2cbf2yPokH5fLyyS3Y918bSZp6i0HfPizm4bTFNHBF+mvwrsnSMHVIJwkzImP6jCUR78wWeJMQQd438yUyzSKeXABdPOTxFytJB4kdAVBRJS0ulpIkYjPBzPwN9IwmQRl/xKcQp/9ITziLh6/v+iiVusSxIamkV3dpMdX2uxAGEBsxWUhPRqSrCpHpK8HXS8YAeKf/nlyH5YyQtNMmprVVCqmwU8/OdayMf3hxkzvur7XFjIAeFTu0outunh+f7HDfBepk/eMH/7ymaxgoh5jjnv8wNNKYgvw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PS2P216MB1297.KORP216.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(52116014)(7416014)(376014)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XkfJlZjor7zwuWFV70bK4tu4FP0oqXNbEgC98hxWa/uvbsks5kyxFNULE3Q9gRMw6V6hNlxq8blm5g8pzKt7+n4um5MpP1NhIyoyOcjn4EaWW6/+vZ8l9/Qp1oWFRaYAEUS4trMbadW8SpVYSDScwevbjCw/VOS9eji3b83Frne8+uln0KsOdtdrMv0KWfU1Z5Tn7KL7b5hFM0fgHKfRYqz9EH1dYRzDqw0LEDjYl2R4cZ+q8Of3Cd3SKUfHjb/3nkah3gsTiRGobRO99VBBVdQpd1bFo8QvFC9oqrn22xggtdTvD8xv7BsAodAKcng0iQ05DQ3mEfDCOakcAvKbQDbjMUYPi02w5LvFcZEQD9cnrx4M/nYrtbhRu9KkxPwQuB8Qf1ISRDSCpZldLKeZoheP9zqkzPEGC67Cyun3upi6pxiN5sjDeVzJNc7PXvc0lyGBkjX+W/SuKSUhps/evrG807D8vYrxqg9yp5kPQc+ueMW4oKQqtBwZ1raBBTCF2t2ul93se5f0DUmiBtmFKW/0AF7EfaVwNYf6mR5DSSjL90vKH1rc6E21SgxGr+ytvFFTv5yvGYhhEnLq4+AHaJl2M2diZg9fGnv7y8TwboEtLBF8242p5mFyjZ8ERmciSsNbK36l9s57396u64eNJYI2uuOH+TJvDzrVy/QvCtp23QrqT9xZrm3i5yVkFhxUb3Oi8qb0/jY1GFvRizH9qm1lYG4OK0dPOwuZ6evnlNycL+UGd7nwJsOpj2uVPOqo47v/oyw+8cgn8TDF6b5E2Q9vgAvH46gmfyx6a7djOUU3rPctxc/B1eM5VoCX914CQkXoGwctTxSAnPtGr5gNQVn+IlSzdMCAKbiJmOkk2XdlbGqOfdsSzI5JviStUQWCiU2QPorjJydLvc1LX2qwfO1yh/l//01kRiD9ZZZbWkSnvKi74s87YUBOkbXQRDf5vtUv+ekluzTweyt3RfZjq1ttov3Vk4660JfHhrzGinaG73zvYlsqZNC26KCzKwlmntWCHdrvlxMjQKAua+aSdV3wdM6wdB29UGdg/ebyEaLeXdOXiWgD8Im72OHzVQ9TUGxh/aRImT/vop+pU4U+4139+CPPNXMXx4wewVcWT8H5ruMv6YtznkqrNL1a1gZiKXrr82Lny5HhKA/zb79XreBTzn9IjqAweJUqWHdsg9oquokb09sKZnuNXnfCsQiXMVdfsN3nO8KniYNKo+jTAo1vr9p8AhDTzsXwAVhS80MBW96UyYr0fFWhbmND95vvPCaEAj0y2pARb1mwGVT8Ou28owJYdflP6FoLY87+/6ZnOOerlLP4fEduk94JKFPjXOvTSDt4Jn3CATX+kq+n1AnGPeRy5P5Ay5MkNKjNEM2vvl0vMWZdLfZuqukAF0jyRi2qMCjSuODnN/jaibf55OITjeRIJm2ITjh/1TGIlnPZab5oFnguBdOmGKsKP6St20u1Lw4Ucaj4qErbav6jixZA7JBQRTrXQvMGxPie3sR/2+K1PBzmIDye2jeTOMv9cfB/5WiDxnNeuF3ghypC/msH6va+mSfrYdajIJIqbvhs0GOJGblgaqN7Zr+2YP+XtuLZHkustBlecO5l0hSRoA== X-OriginatorOrg: chipsnmedia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 390bbf4a-fec5-4d84-122a-08dd77e166ba X-MS-Exchange-CrossTenant-AuthSource: PS2P216MB1297.KORP216.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2025 03:40:13.2676 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4d70c8e9-142b-4389-b7f2-fa8a3c68c467 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nMDO8zzt2Id92bmQY0FulvIWDMTL0ZETEKecIO4CUzlnpxWzri8DcaFTL2TcmL43ulOCFGNfnVEaBTujAEF7s+0r2rJZiAddHA/Xqld1uNI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SE1P216MB1318 From: Jackson Lee Since applying changes for performance improvement of decoder, there was a problem related to high CPU load. CPU load was more than 4 times when comparing CPU load. The root cause was the device_run was called many times even if there was no bitstream which should be queued. Signed-off-by: Jackson Lee Signed-off-by: Nas Chung --- .../media/platform/chips-media/wave5/wave5-vpu-dec.c | 12 +++++++++--- .../media/platform/chips-media/wave5/wave5-vpuapi.h | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c index 485320db9bdc..58340fddcd04 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c @@ -1280,10 +1280,13 @@ static void wave5_vpu_dec_buf_queue(struct vb2_buffer *vb) __func__, vb->type, vb->index, vb2_plane_size(&vbuf->vb2_buf, 0), vb2_plane_size(&vbuf->vb2_buf, 1), vb2_plane_size(&vbuf->vb2_buf, 2)); - if (vb->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) + if (vb->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { + if (inst->empty_queue) + inst->empty_queue = false; wave5_vpu_dec_buf_queue_src(vb); - else if (vb->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) + } else if (vb->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { wave5_vpu_dec_buf_queue_dst(vb); + } } static int wave5_vpu_dec_allocate_ring_buffer(struct vpu_instance *inst) @@ -1474,6 +1477,7 @@ static void wave5_vpu_dec_stop_streaming(struct vb2_queue *q) dev_dbg(inst->dev->dev, "%s: type: %u\n", __func__, q->type); pm_runtime_resume_and_get(inst->dev->dev); + inst->empty_queue = false; while (check_cmd) { struct queue_status_info q_status; @@ -1592,6 +1596,7 @@ static void wave5_vpu_dec_device_run(void *priv) inst->queuing_num == 0 && inst->state == VPU_INST_STATE_PIC_RUN) { dev_dbg(inst->dev->dev, "%s: no bitstream for feeding, so skip ", __func__); + inst->empty_queue = true; goto finish_job_and_return; } } @@ -1737,7 +1742,8 @@ static int wave5_vpu_dec_job_ready(void *priv) "No capture buffer ready to decode!\n"); break; } else if (!wave5_is_draining_or_eos(inst) && - !v4l2_m2m_num_src_bufs_ready(m2m_ctx)) { + (!v4l2_m2m_num_src_bufs_ready(m2m_ctx) || + inst->empty_queue)) { dev_dbg(inst->dev->dev, "No bitstream data to decode!\n"); break; diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h index fd0aef0bac4e..f2596af08cdf 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h +++ b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h @@ -821,6 +821,7 @@ struct vpu_instance { bool retry; /* retry to feed bitstream if failure reason is WAVE5_SYSERR_QUEUEING_FAIL*/ int queuing_num; /* check if there is input buffer or not */ struct mutex feed_lock; /* lock for feeding bitstream buffers */ + bool empty_queue; struct vpu_buf bitstream_vbuf; dma_addr_t last_rd_ptr; size_t remaining_consumed_bytes; From patchwork Thu Apr 10 03:40:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jackson.lee" X-Patchwork-Id: 880759 Received: from PUWP216CU001.outbound.protection.outlook.com (mail-koreasouthazon11020083.outbound.protection.outlook.com [52.101.156.83]) (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 184AD1A9B3E; Thu, 10 Apr 2025 03:40:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.156.83 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744256419; cv=fail; b=V0YcRyx1ABZCH1ZD6XgdpJS7DIf5v5CYg479NqCTBuSgYAYnH92rJ41SNRND55QF18vLGijWC2F0/RihIm8UkBe72XozqXzUMd31Id24lI6R2k5kpCjFoaECCVUkZrYdrROvHBUtcGDjsfYQTutSgPH0ITYVuc6gGAyvp8TCLjc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744256419; c=relaxed/simple; bh=dmyIOuwGzzrEca7bRqtHfH0wm5dQ5ukVrb7LiUCR/sg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=M3KeWYZepp5B3LIg2pIPBw4vWDJZcsHcA7a/bJAtLJ4aD/cb/Rv1RbAEv1csQN/OLpJAw1qLKBA/a1HQTImNM2GfmTvnA4ysYG0/GQy09a6M504X6/M5Dy/bB6szL6cfep+QBMT/4XHPfdxQDu+Tgl5Iw5qb0q+4ijG/gv89H5s= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chipsnmedia.com; spf=fail smtp.mailfrom=chipsnmedia.com; dkim=pass (1024-bit key) header.d=chipsnmedia.com header.i=@chipsnmedia.com header.b=Ms93Bra9; arc=fail smtp.client-ip=52.101.156.83 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chipsnmedia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=chipsnmedia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chipsnmedia.com header.i=@chipsnmedia.com header.b="Ms93Bra9" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=P3JhPVh/JIo3f0lRHd4CaOIB/PIjQdbGKjARneDvoTu17hrAtoDDXNTqzDDK2ovBhAEPRdp/BgcFE143cwRJZpY133NqZ+LunsLpgn6P7xwgTnXMHqGoZLkSTrh5vRtl7afKo1FM6vrEM5+Y7gCD8FgpPKNXdvPG74aqSTMCS/LglhfkxsFafRtH1Uz/jRaB35k2ogBp+8yUB2MvgPv9TOJcpEuWjjAzKlqOrswAgkMh7vCxQuz5SiiTw6xkvwLraEw0JwznN4yGg0y+Nire/Wk6gro6Th2qNAkVt4DnhZDYBGGbsmxjwcB5fv9Rsc7IqopS8VhcbCtNVovKaE7k0g== 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=1x9nmvdWtC6i5OPh/z7K7badGx7j1ocreuYxUkmqyk8=; b=hAyUSDKvC3mZkETQmyfkfgHm8aZYAlrg/isS8oK0GxRbM/AkZOgnPU4M0QnEQ9vLet/W+uy7SooU836DP7jsrEULrg/yiRlITELZXRPWtpAuQfawMQmjpU+PU8Gq8mtP+7XXYiL025irUZfE4/Z8XOZb+JSOMVJEF0CvgvOgqic8G+1o931/KbqdLfipmHId0UQzdsmKZr5mOSjKT4bh+UjAb14re7uQu8vIJ5/LzrCOqPo9itUOLqpRje7VTBZOpiNpYO4z8bAOko5S33eYQYaxZlqHNuxwq6joSFXqCsOE4OcUK3evQglgoLbZO22194tinAayKX6VGwhdIYB6pQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=chipsnmedia.com; dmarc=pass action=none header.from=chipsnmedia.com; dkim=pass header.d=chipsnmedia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chipsnmedia.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1x9nmvdWtC6i5OPh/z7K7badGx7j1ocreuYxUkmqyk8=; b=Ms93Bra9TScJ4hobh/6aTuz0SH7vB5zWSLmxk11GS8fu0nNWnhil5PD3m16tNnEdMxxevpsNDKjICTH0oInFtONLzXoxy4ITV/sCYz61KKoUn4KnFXtmpctNZ/tjz6SmowMj2vjPIdBAyYv4uBEz6r2p3nScIxVRRIy/wK1fLr8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=chipsnmedia.com; Received: from PS2P216MB1297.KORP216.PROD.OUTLOOK.COM (2603:1096:301:73::13) by SE1P216MB1318.KORP216.PROD.OUTLOOK.COM (2603:1096:101:15::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.23; Thu, 10 Apr 2025 03:40:13 +0000 Received: from PS2P216MB1297.KORP216.PROD.OUTLOOK.COM ([fe80::d095:716:2d14:f386]) by PS2P216MB1297.KORP216.PROD.OUTLOOK.COM ([fe80::d095:716:2d14:f386%7]) with mapi id 15.20.8632.021; Thu, 10 Apr 2025 03:40:13 +0000 From: "Jackson.lee" To: mchehab@kernel.org, hverkuil-cisco@xs4all.nl, sebastian.fricke@collabora.com, nicolas.dufresne@collabora.com, bob.beckett@collabora.com, dafna.hirschfeld@collabora.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, jackson.lee@chipsnmedia.com, lafley.kim@chipsnmedia.com, b-brnich@ti.com, hverkuil@xs4all.nl, nas.chung@chipsnmedia.com Subject: [RESEND PATCH v1 7/7] media: chips-media: wave5: Fix SError of kernel panic when closed Date: Thu, 10 Apr 2025 12:40:02 +0900 Message-Id: <20250410034002.88-8-jackson.lee@chipsnmedia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250410034002.88-1-jackson.lee@chipsnmedia.com> References: <20250410034002.88-1-jackson.lee@chipsnmedia.com> X-ClientProxiedBy: SEWP216CA0051.KORP216.PROD.OUTLOOK.COM (2603:1096:101:2bd::12) To PS2P216MB1297.KORP216.PROD.OUTLOOK.COM (2603:1096:301:73::13) Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PS2P216MB1297:EE_|SE1P216MB1318:EE_ X-MS-Office365-Filtering-Correlation-Id: 2a3ad24e-deea-4dd4-24c5-08dd77e166f7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|52116014|7416014|376014|38350700014; X-Microsoft-Antispam-Message-Info: aiRfL/H3aTYftFsWG/grbFcuX5NnJnT0MSuinh88rZH/RXh5g32hElcMiMHFdOIZB9E8GlYKZFk1ZwXnF41V+5mrd6ieldCzX7XRTx8qKzcOFUYVB+fy4ABxysPz07zhIT0Blx8Ri7GAo63SPFAwN2WKBG1z6ZptOrwQgixAlP28rQFQ1PpoZF1Y3nqLYdIKkfp6fDWqerGMEtKlmCDCu4QZMecQ7HyH2onobYRXqpSWOWv+VNSCb5Q2Z9i31Fr3uLSM7WDlPguvJNNbD2D8X7NZulD5r5zjyiy8zr2mlhJeDr+WypUMT5E3XEJR6MDHOuk857/NKEVPLEVB/PJx5atG0P7E4spKbeLnnwBDGmnP1w75bNHbOiN3/azBBhJwqMV1VbWhJwJq8k8wNkgEK8RCg8TY/scyH580AqawvKxT8G6Dh0H/VmevYQ11knKg1bzBejmxrEm915tAuy9unYn6T7bvKdUc7JSfRHhbW/dBg/C1EZq6RsTHVnK580SeGRcUK5pbwIdYmgjfmfif0PbGzpS+MWNyL9f78mt3SoPrX2y5CtVjrJ8oy2JGuH/nFC/0NpiCmXuLmVJbEZTzt6kXCqj6glmeB52WD0hJhC2WFsByqwliMp6fN7Iwba3XO3PtXHZ+YxiOp4AwRpWmVQdJPO7J3+86w0KonWQyAYfnUQp0aAqror06Bpo46Uozf7zYC+q3N8CCTp5ljhNbTeIV6vGPpLePpjyQ6nKaEE6wxxMW0i6ZTPTFurKzDfZmW8T8qPLQwmmFpl3ILW7ofnNEORE8xbv9dflJo7N+YrYrNQ/yPs+GHEII+UhLrDXBlmNaHtFdwepTkpkNAEFbJ5B/Ym0l4U+yAL9LCs06VF20wkcgxzp6q0HHETHNW1VOm7Tlbhf5thOTrkWdeq2IHWKYiX/3V2UHR/rmvqAtkv1ikLCF4h1zdmlrnETAG0p1O21w3dSemuGR3wziEhpNLBnYJu+Ipk79KZ2bVtrLjNEkjlN8R8bcpksiCQdCSmIrWzkRsYylFabM3InGls1Y4QlZscNpj6WuwPus6GeS0Ueicf1/gu5/WBX4iI2yotL9q46QqgmfWDGrzS0i+alk5zkvPPtrMdFQTJxUjvoHG1UCurLODKVVUaqyNiwaDYm2jvZW0+62Hk7EoGTpU6eNSOOduckUUf7Al5yoyuzuFX0v+fMNXUORdz1CSJ0Zj4lby+oK16GBNfPoc0m/kcUKG6wzLUhPJ+3xsn6wFvbeO6o3KzeQO6xq0ir99GHzORCrOSm63VwZsiZDTCQlrdRm3lsCoMKUlEMAFmmprYU3LrHdJvFlzdNmSAtTrJEU9j20zg1QrGS9ucFA9MQw8W8wR+dv76Nx+gqS80zjltGAKlsgxS0J6DyGengVZX/alPEyGMXi0X2dMbuig4BN8Ibd47wYnyNP6itpqEIHY3LaVjc6CHxxHH0Xg2hRTpJ9k/PaiSJzGhQ0MoKiC5ZbYYVHIQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PS2P216MB1297.KORP216.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(52116014)(7416014)(376014)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dv9XUUKPhcRYqnYMuRA25W5Jbl6u5/dZe8FUbSZmVTwkFSYhQr2kShXXqnRtQ5UYYXTh+6j+e9td8acZkzCYmQ2vYLF8fbT0wtrqHCo1mMO4qYO0SJBlp988D8w5N1FpDn9kDlI68tE9oeOhNZvEN2iroKazBvRkboYhZOrporsxnwx4hHEHmcQ0s9shfScVA0s1j9pkVL+dWWqmnCqKY4hGdGesOUGq1Y110USspc+ZHrzdPcVhmW3LjmFvdQCr8zsJfPXnf7eeSezORutUAJzgmhZ01gS2r6zLzgEhbZym56yA6NIC5iPvzuxxsico2u7JugpV7/utN7skkjmodyTgsgeHkNH76MttKhPxelS6D4baCpE2jbxSlmGobB7cA7J+VMWp2+oI2AaHDqJ5B8FIGLWIFNY/+lMtxluNWXEUcJOuLOj61734MkQcnjAB6dLZnHKBlNr3pT5L6IphEBT6K8mYR+aDzbW1kqkkPi4KUgD1DA82u9iC4wFzamF9nY2LeMhfpfgYU/ANt6l0PaYEDSz94jIjZLDbYxNo7aLUavvAjShO4E9RCrQbO1beUaVdOwkTRRrvKQ/VEuxNZ7CymKvpOq6G2YDE1zcD2BCrW4x19OETLWib/ZFnXiOjuQMvDe1aEKD3VdUrEO2nPy2vsM7a6lY0JozQKjZSX/HEvkke7mYkFOZA7bfNLPvd344fgVrmbMYpmrNMdyuEBloVMihnY3hqqv4ZgtYEo/iQaLBydEd06cfOrzHwe/Z02DX8PQzEw7bkFtWriv/jR6AllR1o9PQasikqlsC0U04xbm0PudtX9I0dLcb7YclBPLR5zh0yX7BXaavyKr2CPY1OsCfoBLw2ewENhSiY0ChrJDRCpmGEat6xXr342I7LS7o0gFyYApX1xCJbdICwE46IvFLGgzoRknqS3w5xJieIvqXAEHnZO5L8f31Htx+kGAFLPqz7to8dE1LO/5+x01nRVnEBRG+Uu6OdQed2xKczmT5HdSfiCOHWjgu4KTGcDkxv6oMj/2bRTWM2eGfUY+frGumSQ7jooXqfdNy+YUN3cxgCT+TR9UaLnUixGd4Ky5oQqeSociZOkqrvuKruhULZqKGbrTedYDGyVKKN+eiKMqtY1gakcLpSdY/ZVOpJi4LMz7rEzAAoFGQ1i81ecoJodHsunl1BvnCJo514oa+zBSs7fqWylylqkHnr91SFLqYPnven0eVemJ/TN4cdW3g9yhPjwr8st38m62ROXfiakhXN/cpsgbsgnDoXjJ7M89bxiWfNebLl78BKS0n2g7y34INsjShKDZszdgLnZeZ5B7aVHzZ7ASQhntX+2GxmN+Ay+Vie4XoRJB0o7rR5PTonxRTY89OSklga/zGiK0ibDa8LIn+uqR8MC+IIWxml9NTJwLhJVnorrsgBgo3sD8636Uyr82czkJ85l+YQgMDg1BoghBXALgPqb+o0XWNWoXptEyZMCFQMnzO9RkK609TCYtr6vhVKwGOdKMHL0EPj+ZJXsmc4vUJjpa7C5SboMj7EwSHxPZ67LwTyESe5B92FDrdEaAeMc+9/VKQjA3Tjf0Ms45/I9aUGsD2MMijuWxDlk5nSx6GfpZ7PvQJDKQ== X-OriginatorOrg: chipsnmedia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a3ad24e-deea-4dd4-24c5-08dd77e166f7 X-MS-Exchange-CrossTenant-AuthSource: PS2P216MB1297.KORP216.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2025 03:40:13.6424 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4d70c8e9-142b-4389-b7f2-fa8a3c68c467 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: TAlnh0VY7ZrMh73mqd3BjaPAFq7VOsZHJZRgOd5DBBzUHR4Ralq/XPt1i1iQ07ypvLZPwSuWzooCSWiNSUCgNooCzQehaB7Zs1v7bPier+c= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SE1P216MB1318 From: Jackson Lee Since applying "Reduce high CPU load" patch, SError of kernel panic rarely happened while testing fluster. The root cause was to enter suspend mode because timeout of autosuspend delay happened. [ 48.834439] SError Interrupt on CPU0, code 0x00000000bf000000 -- SError [ 48.834455] CPU: 0 UID: 0 PID: 1067 Comm: v4l2h265dec0:sr Not tainted 6.12.9-gc9e21a1ebd75-dirty #7 [ 48.834461] Hardware name: ti Texas Instruments J721S2 EVM/Texas Instruments J721S2 EVM, BIOS 2025.01-00345-gbaf3aaa8ecfa 01/01/2025 [ 48.834464] pstate: 20000005 (nzCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 48.834468] pc : wave5_dec_clr_disp_flag+0x40/0x80 [wave5] [ 48.834488] lr : wave5_dec_clr_disp_flag+0x40/0x80 [wave5] [ 48.834495] sp : ffff8000856e3a30 [ 48.834497] x29: ffff8000856e3a30 x28: ffff0008093f6010 x27: ffff000809158130 [ 48.834504] x26: 0000000000000000 x25: ffff00080b625000 x24: ffff000804a9ba80 [ 48.834509] x23: ffff000802343028 x22: ffff000809158150 x21: ffff000802218000 [ 48.834513] x20: ffff0008093f6000 x19: ffff0008093f6000 x18: 0000000000000000 [ 48.834518] x17: 0000000000000000 x16: 0000000000000000 x15: 0000ffff74009618 [ 48.834523] x14: 000000010000000c x13: 0000000000000000 x12: 0000000000000000 [ 48.834527] x11: ffffffffffffffff x10: ffffffffffffffff x9 : ffff000802343028 [ 48.834532] x8 : ffff00080b6252a0 x7 : 0000000000000038 x6 : 0000000000000000 [ 48.834536] x5 : ffff00080b625060 x4 : 0000000000000000 x3 : 0000000000000000 [ 48.834541] x2 : 0000000000000000 x1 : ffff800084bf0118 x0 : ffff800084bf0000 [ 48.834547] Kernel panic - not syncing: Asynchronous SError Interrupt [ 48.834549] CPU: 0 UID: 0 PID: 1067 Comm: v4l2h265dec0:sr Not tainted 6.12.9-gc9e21a1ebd75-dirty #7 [ 48.834554] Hardware name: ti Texas Instruments J721S2 EVM/Texas Instruments J721S2 EVM, BIOS 2025.01-00345-gbaf3aaa8ecfa 01/01/2025 [ 48.834556] Call trace: [ 48.834559] dump_backtrace+0x94/0xec [ 48.834574] show_stack+0x18/0x24 [ 48.834579] dump_stack_lvl+0x38/0x90 [ 48.834585] dump_stack+0x18/0x24 [ 48.834588] panic+0x35c/0x3e0 [ 48.834592] nmi_panic+0x40/0x8c [ 48.834595] arm64_serror_panic+0x64/0x70 [ 48.834598] do_serror+0x3c/0x78 [ 48.834601] el1h_64_error_handler+0x34/0x4c [ 48.834605] el1h_64_error+0x64/0x68 [ 48.834608] wave5_dec_clr_disp_flag+0x40/0x80 [wave5] [ 48.834615] wave5_vpu_dec_clr_disp_flag+0x54/0x80 [wave5] [ 48.834622] wave5_vpu_dec_buf_queue+0x19c/0x1a0 [wave5] [ 48.834628] __enqueue_in_driver+0x3c/0x74 [videobuf2_common] [ 48.834639] vb2_core_qbuf+0x508/0x61c [videobuf2_common] [ 48.834646] vb2_qbuf+0xa4/0x168 [videobuf2_v4l2] [ 48.834656] v4l2_m2m_qbuf+0x80/0x238 [v4l2_mem2mem] [ 48.834666] v4l2_m2m_ioctl_qbuf+0x18/0x24 [v4l2_mem2mem] [ 48.834673] v4l_qbuf+0x48/0x5c [videodev] [ 48.834704] __video_do_ioctl+0x180/0x3f0 [videodev] [ 48.834725] video_usercopy+0x2ec/0x68c [videodev] [ 48.834745] video_ioctl2+0x18/0x24 [videodev] [ 48.834766] v4l2_ioctl+0x40/0x60 [videodev] [ 48.834786] __arm64_sys_ioctl+0xa8/0xec [ 48.834793] invoke_syscall+0x44/0x100 [ 48.834800] el0_svc_common.constprop.0+0xc0/0xe0 [ 48.834804] do_el0_svc+0x1c/0x28 [ 48.834809] el0_svc+0x30/0xd0 [ 48.834813] el0t_64_sync_handler+0xc0/0xc4 [ 48.834816] el0t_64_sync+0x190/0x194 [ 48.834820] SMP: stopping secondary CPUs [ 48.834831] Kernel Offset: disabled [ 48.834833] CPU features: 0x08,00002002,80200000,4200421b [ 48.834837] Memory Limit: none [ 49.161404] ---[ end Kernel panic - not syncing: Asynchronous SError Interrupt ]--- Signed-off-by: Jackson Lee Signed-off-by: Nas Chung --- .../platform/chips-media/wave5/wave5-vpu-dec.c | 3 --- .../platform/chips-media/wave5/wave5-vpu-enc.c | 3 --- .../media/platform/chips-media/wave5/wave5-vpu.c | 2 +- .../platform/chips-media/wave5/wave5-vpuapi.c | 16 ---------------- 4 files changed, 1 insertion(+), 23 deletions(-) diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c index 58340fddcd04..d069cb955a7c 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c @@ -1865,9 +1865,6 @@ static int wave5_vpu_open_dec(struct file *filp) if (ret) goto cleanup_inst; - if (list_empty(&dev->instances)) - pm_runtime_use_autosuspend(inst->dev->dev); - list_add_tail(&inst->list, &dev->instances); mutex_unlock(&dev->dev_lock); diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c index 52a1a00fd9bb..7f1aa392805f 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c @@ -1779,9 +1779,6 @@ static int wave5_vpu_open_enc(struct file *filp) if (ret) goto cleanup_inst; - if (list_empty(&dev->instances)) - pm_runtime_use_autosuspend(inst->dev->dev); - list_add_tail(&inst->list, &dev->instances); mutex_unlock(&dev->dev_lock); diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu.c b/drivers/media/platform/chips-media/wave5/wave5-vpu.c index c53ac9a5c1c2..ae2c3eefd00a 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu.c @@ -367,7 +367,7 @@ static int wave5_vpu_probe(struct platform_device *pdev) dev_info(&pdev->dev, "Product Code: 0x%x\n", dev->product_code); dev_info(&pdev->dev, "Firmware Revision: %u\n", fw_revision); - pm_runtime_set_autosuspend_delay(&pdev->dev, 100); + pm_runtime_set_autosuspend_delay(&pdev->dev, 500); pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_enable(&pdev->dev); wave5_vpu_sleep_wake(&pdev->dev, true, NULL, 0); diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.c b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.c index d7318d596b73..1f7f4d214b3c 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.c @@ -207,8 +207,6 @@ int wave5_vpu_dec_close(struct vpu_instance *inst, u32 *fail_res) int retry = 0; struct vpu_device *vpu_dev = inst->dev; int i; - int inst_count = 0; - struct vpu_instance *inst_elm; struct dec_output_info dec_info; *fail_res = 0; @@ -265,12 +263,6 @@ int wave5_vpu_dec_close(struct vpu_instance *inst, u32 *fail_res) } wave5_vdi_free_dma_memory(vpu_dev, &p_dec_info->vb_task); - - list_for_each_entry(inst_elm, &vpu_dev->instances, list) - inst_count++; - if (inst_count == 1) - pm_runtime_dont_use_autosuspend(vpu_dev->dev); - mutex_destroy(&inst->feed_lock); unlock_and_return: @@ -738,8 +730,6 @@ int wave5_vpu_enc_close(struct vpu_instance *inst, u32 *fail_res) int ret; int retry = 0; struct vpu_device *vpu_dev = inst->dev; - int inst_count = 0; - struct vpu_instance *inst_elm; *fail_res = 0; if (!inst->codec_info) @@ -782,12 +772,6 @@ int wave5_vpu_enc_close(struct vpu_instance *inst, u32 *fail_res) } wave5_vdi_free_dma_memory(vpu_dev, &p_enc_info->vb_task); - - list_for_each_entry(inst_elm, &vpu_dev->instances, list) - inst_count++; - if (inst_count == 1) - pm_runtime_dont_use_autosuspend(vpu_dev->dev); - mutex_unlock(&vpu_dev->hw_lock); pm_runtime_put_sync(inst->dev->dev);