From patchwork Thu Apr 10 03:39:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "jackson.lee" X-Patchwork-Id: 14045839 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 464811F09A8; Thu, 10 Apr 2025 03:40:17 +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=1744256419; cv=fail; b=AXbPjYe93ly1ochRWC3z92lH3n06VWaWnTg+AzMUEvOuzp3uAJzqNDXodSdAQ06dGdtn1kK6bwgzuXsjrVUEeGvIBH+Zza5UjEcrbuhe2YHA1H/gTJTd4QbVeLmo6PzQ8x0ywI82RlEq4hMjhmveCey0UDDWKoIKuRJEjg+hOLM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744256419; c=relaxed/simple; bh=YYyAeLpW4vipwI+e7DPZ+U2TdfP4pmNlVJ46ZE35GvA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=M4X0LuwaYEob6LlHMknvQXh75GS0i+lIVm0Mk/KWAo01N5g9GQaVBstjBWW/nsWdVlIMD5HW4RzeqNyX0RZg01sJWuC/i49X69pAwB7B2qE9WKP/IZJTh3QvXR8mgl+1m8Rg5k+vnrmpywOjUnVW84MZaB1+hxT1o+RowBm8epY= 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=WTIKYhSL; 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="WTIKYhSL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Mr9pP3G6jw7riiRwFvDxD1rnwdquzgILrh5fYrEEtuE2nxYSnXWUurTbqNMUF/i9am4Q1CXhHfzvapRXHVO90QQXToPccFfiASpLTjqWXKmXAqdfSF5N0I/xCTupGsf1tf+stTtJ62GMcoYffPHFGL2Xq5YrCrQMN2pDeEBsQMFQVd/aia4nFj1bsnK83bwpGEAsFqt1RWjRM0lJJmbTKWKcdF/T6UooWdK4EbT4x3HM6JRUDWVGB/4tWBLrgpinCRmm7Gxr37vL5HzqYlRifsXlYkfoQykj/nxRB27iAjPikFTYpc5mpQe28xKz5EWfHtbkLCBQo3xq1LzndvJBFA== 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=UEpcFnUz6GCo97dFlsyfZ2Ur8raX2EqapoLu7MGFadk=; b=XT6eiNDrAo7me6kqmPLztnhqZiV6oeWOB3oEvEFEOeJLPe06GTcR6oyvHDCG2IzRZhehrm2J115MOHHHasX0YYiQZ11dsP0WIuSCwymRl+t1BmZn7EKHoOS3P2h44as9DvHG/yV2svraZEzClcp3DKT6gtXaLyL9Ns5YTSIyRI94J9B+SRBUDn/bZwofGPRxZPwW9g11k5XSFm5p6jULBBBieHh47oEyb3Eefr1s2/FYu2vA7UXmGM4gYl0M/gMKBAy9B0pt5lr6xI2k8GufftmH5iCu4oyqVz36htWonoiRl42mSi0epnSUwvdghr6RR0vopxg2Fy21vcyl2RuHwA== 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=UEpcFnUz6GCo97dFlsyfZ2Ur8raX2EqapoLu7MGFadk=; b=WTIKYhSLT6Ij35QggxgCQ0/el9Il6YmD1Lv5W/dzLckPeFe8jCBev/PWMn7ybRRfMuzDq1FckmK+LL6Nnbwo8rHR+VwUKHsSx3mFSP/7u60B7NNhRe8612YWA9PyirNLU8pTZanHCECAUZjxvt5mkCTUucfDa/KynKsVcFW/jmE= 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:11 +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:11 +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 1/7] media: chips-media: wave5: Fix Null reference while testing fluster Date: Thu, 10 Apr 2025 12:39:56 +0900 Message-Id: <20250410034002.88-2-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: 720fc935-d717-4f6d-2c00-08dd77e1657e 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: sGIgkoxI/rEFyqVLO1JVZ43xuOUycgDMa9gjOJUe3oWbYqFGuhKchM1frDCrgylKPqIe/DwRAGIeprepgW+TuD3lu/bwHUlprK4LgUKajjsFU3IcqFBKrnf12jVQircyay94HbowwUtIz/PtQGb3Y5Ke302oayMV97YvBkX9Eb2triP7BmypUPd844S69yuqshkPkUkgxQKo/4S6V1Av7Je1S7rKFWfb0kT/1CHTe0Ieed/KS50/InbojdO4TwHY1Xb8FbcFtmp/NmvKCUZAAHKo8gSmoT2qHZ7pZau6OYYqiqEmkDmUgbpiUIFWBSldVf62mZGTt0pWveP+HTOP/PWai1a6x4FjBBfOm3sOnFarDrua9DEnUYi5M2Qm0iW2XeQXiLRqLamKdbYB6y7wMHH9O/SfhWhhnoYs08fln6KElVzkzHSIjxJpryPbwg3eDIqephcYjAtle3WQTWmjnupOjbuqW7x03bUzhMYMl7MA3zqRc1yzpqk1ELoKSPy3f+xQowxXan2bIZiXZ1FZ9N9MDeYKz1575Nhhmk+Lq3mJlqzkVoybSeaenhDyAMp3aIQiOU+zJc+QLra32uMgZzEUhvYuTRYDaSntS3yQxa0/rDfDbH8He0u73plbH+OeEJuTkhCh5smz2NSuEO2w+6bWqYrrTunawUageTUhfk4r94QyiqXojYi9CV/W040Vd2ZeirWTbnIAJjAN/eEo2rtYf0fxClnYFmRMkYGCf6Z+6YY3VKMfGOPVt7dCugBsNMkGeGKBUz5c91SYUipyMYb28KxiG9/di1DyzOzV1BTkeTRHPgL5+PeDkJDgU3/Y703tD8tlAdQU7/mr5bcHXyFYsSkdNWQIQGpJHbaKZ7YppxH1HGFcMbz5j6yQ4ow0FTYiEwEPdneRlTMOgbFLeO+s/y1sS/aqxWn49zb0gVWDSl4ABm96lygAEjY8j8O22OHlj/qaR+R3vRA8kKNND1rHN5sUhQ9VV0AyyJwyBNrv6IA4EECicG1mIIVELRVajk34VxLLZ95n37uB9PYy/jy4ehhdzl/8rqpMmDrJTQDYdyj5GKU4c0aNy5eREvleM4oKGP6GvmwPzDhvr+9Y+GPYHmQdiwH6e7V3hNrqjyQjOJW4VHXH0PsUnIdTDf7VEsPiOVCwPSqe2P299Zq7dKMmQG6HNlP83G4pBpZS8L+P40kZ/iyyvtP5Mdk6bxXPW6Gy0XBPr6VmydDxwlK+0r1Rr05hdqaxpEBF1Fn+70bHSKxtRNWx3Rzd/g2ukJXgxozdK09BrMD9bqzQfbUieoKJV6GZYoTr/SVioJB8U7dCL2v/Mk1QsLFFi27+pnR8aUtG+HvYvBWMj99u1bv+5EMpWjmgN/ydNzHoKb5stQ+3pwjfNiBZgjIVgt+Jg3JX5nbFAXwZDIP3xaqh9y3LVGRbXsFcm62n58F+7uuHY/tnVJeD+hJ1KqznnViNPeLq 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: ZWghSe5T+Un1PXhkt07VtcZCMHuKdK6jOzJlL2rcWvNequ6dPH6ijrLzJ/pZBTaEsThhNfgj6ZtyCqNmGzeRgA+XYYXGOeRAdz91dgopvi3+XJECG1r2l1ZfFPEB1YLdYVihTx9oJmCPLPZoAeoLKIAyVpCL/AjBJpZrO0rRIGL2EkOK90K5WosqlS5oBoiYX5BXGHNOF8J/dIoMoyVCtqi7VYfmCn4XwPPnQWzmglnYe2Uo7J3mm2332BD2MoD4zVsVeh58/C+wRGYLMYxN85XWsu2DKaf+G0kcnaAedIO3VvGjaof/Ob4UTUKMKSSxuMsHsPBeu2bG1ZQu/XmgLcs6hOeP2v1tnV4Sox/d+/zcj87SwtIsGEb51gYB4Ik/pSRwsKcrMy65JY1cOr2gMd0AsSoRgZ7ggyFSslqrMh0myPCqfW81sfwt5e4w6bSENy5Iu8myIJL0k8Mt5RklEAsseHAsz2J6hBg5ugDlYlijyMOIght2F636JJNjWwbBA9bS4JEh9Y0Nm21DAhgwL7iAY4E9DLNmwvZZZU9zsUXZUMtjZoWOzJTx6sX/TTJMJYqeOdAVs3zu2p4iPC0S/PWTr3Qv5FqsZIXvbB5eSmcr+SWzl2kTbnkvcVE5vzaWRWDL4+J0rj2+eC0DVgST7b+0tFCuXshaOVwyE9d7cUZoYrxuGbTygGQwwVWPZyMc3FIu6kiL0O1w1mLYjZ3CbvPx8H1oMqTW1G0sUM6jPTu3vxmV/Hy5X728PQ27abyYcxrTWFp6VJlgfbzoEsh2MQsrM9s5xCVIyNKhycyxlkytd1MzQYwcOFmihfAPx3H7+4Ws4diKa/2RgZCkFkQZ2gjVzPOUVwCjDaDHo2AciN2WdUzjPyw2gvF//emca1viLllGGMY+PMBjRUqMeQTM3htmUJK7FXYn7OLMcd7Q66gv28q2zDe69E1TycOd0kIg7ls9VebMKng+YZd5eFcUT3RHZlhviKMZuJ46p8IpVqO8ILEgLrPYL+m1ZNI0snbEsJY2/M0Mkc4of800EUrRko5mfm81tWWuDEddsUdrtSoteAjD4JL9lq7iBpsJ9eY8CiV8mDdGD2OJh4B7QQDDtgACUq8A7PNlhi6+XMvyHASmLL2/E2Mys4YjCmipJNrvmkwnwGpGoOj7xVuoO86CL8CxAXvYqeNIog5sv83cwCJmDxjzsAWlyg6qVRsGtx92wSLM5if7kyq41+DPRUI0585I4PCukAhCN2WQNb2wsPQcHCob8rTG0taX8wIKbfOCefWCTFoI9iIOl1rpLQEBE4/8r5ObCP62oRVElNizhQL2noi3cOHHRjJ8nIRHEGX+4U01xgARQ6IdwElN8hkmrG+2SyHjhHj3eNRMkNmNhxOq1baAmZvrei3leHD3HFcp6MZBHmAQGH1Wmw+SFUvbskgxutOGfM2UnFB+9eQ+jwOTYAJDlSKK5WqPvL2MFeuknIDZIYJCHqrRTOICpzMHaG9qNcoub8dKoPTbmp4tXKD91yeLybMsGIcY9sIAb4iYheAY0+/GtDGp7YqiK0KxZdDC2qZWC6Z+edotXZYgsazxZu83PQKbp9qyGRoBJV+i8mANEb9V0vxKJ85loRUQRw== X-OriginatorOrg: chipsnmedia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 720fc935-d717-4f6d-2c00-08dd77e1657e 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:11.1811 (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: ZkAveE7mj74hgzb1xDRZcO2dYPkbq5GtAr3LxggV3S2YgOUU2wfLhO0r/OMppYEB5guuashCQMpD3+vkKscz6sGjajNoTuixh6ayZpOJnOY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU4P216MB1439 From: Jackson Lee When multi instances are created/destroyed, many interrupts happens or structures for decoder are removed. "struct vpu_instance" this structure is shared for all flow in decoder, so if the structure is not protected by lock, Null reference exception could happens sometimes. IRQ Handler was spilt to two phases and Lock was added as well. Fixes: 9707a6254a8a ("media: chips-media: wave5: Add the v4l2 layer") Signed-off-by: Jackson Lee Signed-off-by: Nas Chung --- .../platform/chips-media/wave5/wave5-helper.c | 10 ++- .../chips-media/wave5/wave5-vpu-dec.c | 5 ++ .../chips-media/wave5/wave5-vpu-enc.c | 5 ++ .../platform/chips-media/wave5/wave5-vpu.c | 68 ++++++++++++++++--- .../platform/chips-media/wave5/wave5-vpuapi.h | 6 ++ 5 files changed, 85 insertions(+), 9 deletions(-) diff --git a/drivers/media/platform/chips-media/wave5/wave5-helper.c b/drivers/media/platform/chips-media/wave5/wave5-helper.c index 2c9d8cbca6e4..5d9969bb7ada 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-helper.c +++ b/drivers/media/platform/chips-media/wave5/wave5-helper.c @@ -49,7 +49,7 @@ void wave5_cleanup_instance(struct vpu_instance *inst) v4l2_fh_del(&inst->v4l2_fh); v4l2_fh_exit(&inst->v4l2_fh); } - list_del_init(&inst->list); + kfifo_free(&inst->irq_status); ida_free(&inst->dev->inst_ida, inst->id); kfree(inst->codec_info); kfree(inst); @@ -61,8 +61,16 @@ int wave5_vpu_release_device(struct file *filp, { struct vpu_instance *inst = wave5_to_vpu_inst(filp->private_data); int ret = 0; + unsigned long flags; v4l2_m2m_ctx_release(inst->v4l2_fh.m2m_ctx); + ret = mutex_lock_interruptible(&inst->dev->irq_lock); + if (ret) + return ret; + spin_lock_irqsave(&inst->dev->irq_spinlock, flags); + list_del_init(&inst->list); + spin_unlock_irqrestore(&inst->dev->irq_spinlock, flags); + mutex_unlock(&inst->dev->irq_lock); if (inst->state != VPU_INST_STATE_NONE) { u32 fail_res; 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 fd71f0c43ac3..32de43de1870 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c @@ -1811,6 +1811,11 @@ static int wave5_vpu_open_dec(struct file *filp) inst->xfer_func = V4L2_XFER_FUNC_DEFAULT; init_completion(&inst->irq_done); + ret = kfifo_alloc(&inst->irq_status, 16 * sizeof(int), GFP_KERNEL); + if (ret) { + dev_err(inst->dev->dev, "failed to allocate fifo\n"); + goto cleanup_inst; + } inst->id = ida_alloc(&inst->dev->inst_ida, GFP_KERNEL); if (inst->id < 0) { 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 1e5fc5f8b856..52a1a00fd9bb 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c @@ -1760,6 +1760,11 @@ static int wave5_vpu_open_enc(struct file *filp) inst->frame_rate = 30; init_completion(&inst->irq_done); + ret = kfifo_alloc(&inst->irq_status, 16 * sizeof(int), GFP_KERNEL); + if (ret) { + dev_err(inst->dev->dev, "failed to allocate fifo\n"); + goto cleanup_inst; + } inst->id = ida_alloc(&inst->dev->inst_ida, GFP_KERNEL); if (inst->id < 0) { diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu.c b/drivers/media/platform/chips-media/wave5/wave5-vpu.c index e1715d3f43b0..c53ac9a5c1c2 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu.c @@ -51,8 +51,11 @@ static void wave5_vpu_handle_irq(void *dev_id) u32 seq_done; u32 cmd_done; u32 irq_reason; - struct vpu_instance *inst; + u32 irq_subreason; + struct vpu_instance *inst, *tmp; struct vpu_device *dev = dev_id; + int val; + unsigned long flags; irq_reason = wave5_vdi_read_register(dev, W5_VPU_VINT_REASON); seq_done = wave5_vdi_read_register(dev, W5_RET_SEQ_DONE_INSTANCE_INFO); @@ -60,7 +63,8 @@ static void wave5_vpu_handle_irq(void *dev_id) wave5_vdi_write_register(dev, W5_VPU_VINT_REASON_CLR, irq_reason); wave5_vdi_write_register(dev, W5_VPU_VINT_CLEAR, 0x1); - list_for_each_entry(inst, &dev->instances, list) { + spin_lock_irqsave(&dev->irq_spinlock, flags); + list_for_each_entry_safe(inst, tmp, &dev->instances, list) { if (irq_reason & BIT(INT_WAVE5_INIT_SEQ) || irq_reason & BIT(INT_WAVE5_ENC_SET_PARAM)) { @@ -82,14 +86,22 @@ static void wave5_vpu_handle_irq(void *dev_id) irq_reason & BIT(INT_WAVE5_ENC_PIC)) { if (cmd_done & BIT(inst->id)) { cmd_done &= ~BIT(inst->id); - wave5_vdi_write_register(dev, W5_RET_QUEUE_CMD_DONE_INST, - cmd_done); - inst->ops->finish_process(inst); + if (dev->irq >= 0) { + irq_subreason = + wave5_vdi_read_register(dev, W5_VPU_VINT_REASON); + if (!(irq_subreason & BIT(INT_WAVE5_DEC_PIC))) + wave5_vdi_write_register(dev, + W5_RET_QUEUE_CMD_DONE_INST, + cmd_done); + } + val = BIT(INT_WAVE5_DEC_PIC); + kfifo_in(&inst->irq_status, &val, sizeof(int)); } } - - wave5_vpu_clear_interrupt(inst, irq_reason); } + spin_unlock_irqrestore(&dev->irq_spinlock, flags); + + up(&dev->irq_sem); } static irqreturn_t wave5_vpu_irq_thread(int irq, void *dev_id) @@ -121,6 +133,35 @@ static enum hrtimer_restart wave5_vpu_timer_callback(struct hrtimer *timer) return HRTIMER_RESTART; } +static int irq_thread(void *data) +{ + struct vpu_device *dev = (struct vpu_device *)data; + struct vpu_instance *inst, *tmp; + int irq_status, ret; + + while (!kthread_should_stop()) { + if (down_interruptible(&dev->irq_sem)) + continue; + + if (kthread_should_stop()) + break; + + mutex_lock(&dev->irq_lock); + list_for_each_entry_safe(inst, tmp, &dev->instances, list) { + while (kfifo_len(&inst->irq_status)) { + ret = kfifo_out(&inst->irq_status, &irq_status, sizeof(int)); + if (!ret) + break; + + inst->ops->finish_process(inst); + } + } + mutex_unlock(&dev->irq_lock); + } + + return 0; +} + static int wave5_vpu_load_firmware(struct device *dev, const char *fw_name, u32 *revision) { @@ -224,6 +265,8 @@ static int wave5_vpu_probe(struct platform_device *pdev) mutex_init(&dev->dev_lock); mutex_init(&dev->hw_lock); + mutex_init(&dev->irq_lock); + spin_lock_init(&dev->irq_spinlock); dev_set_drvdata(&pdev->dev, dev); dev->dev = &pdev->dev; @@ -265,6 +308,9 @@ static int wave5_vpu_probe(struct platform_device *pdev) goto err_clk_dis; } dev->product = wave5_vpu_get_product_id(dev); + sema_init(&dev->irq_sem, 1); + INIT_LIST_HEAD(&dev->instances); + dev->irq_thread = kthread_run(irq_thread, dev, "irq thread"); dev->irq = platform_get_irq(pdev, 0); if (dev->irq < 0) { @@ -288,7 +334,6 @@ static int wave5_vpu_probe(struct platform_device *pdev) } } - INIT_LIST_HEAD(&dev->instances); ret = v4l2_device_register(&pdev->dev, &dev->v4l2_dev); if (ret) { dev_err(&pdev->dev, "v4l2_device_register, fail: %d\n", ret); @@ -351,6 +396,12 @@ static void wave5_vpu_remove(struct platform_device *pdev) { struct vpu_device *dev = dev_get_drvdata(&pdev->dev); + if (dev->irq_thread) { + kthread_stop(dev->irq_thread); + up(&dev->irq_sem); + dev->irq_thread = NULL; + } + if (dev->irq < 0) { kthread_destroy_worker(dev->worker); hrtimer_cancel(&dev->hrtimer); @@ -361,6 +412,7 @@ static void wave5_vpu_remove(struct platform_device *pdev) mutex_destroy(&dev->dev_lock); mutex_destroy(&dev->hw_lock); + mutex_destroy(&dev->irq_lock); reset_control_assert(dev->resets); clk_bulk_disable_unprepare(dev->num_clks, dev->clks); wave5_vpu_enc_unregister_device(dev); diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h index 45615c15beca..f3c1ad6fb3be 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h +++ b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h @@ -8,6 +8,7 @@ #ifndef VPUAPI_H_INCLUDED #define VPUAPI_H_INCLUDED +#include #include #include #include @@ -747,6 +748,7 @@ struct vpu_device { struct video_device *video_dev_enc; struct mutex dev_lock; /* lock for the src, dst v4l2 queues */ struct mutex hw_lock; /* lock hw configurations */ + struct mutex irq_lock; int irq; enum product_id product; struct vpu_attr attr; @@ -764,7 +766,10 @@ struct vpu_device { struct kthread_worker *worker; int vpu_poll_interval; int num_clks; + struct task_struct *irq_thread; + struct semaphore irq_sem; struct reset_control *resets; + spinlock_t irq_spinlock; /* protect instances list */ }; struct vpu_instance; @@ -788,6 +793,7 @@ struct vpu_instance { enum v4l2_ycbcr_encoding ycbcr_enc; enum v4l2_quantization quantization; + struct kfifo irq_status; enum vpu_instance_state state; enum vpu_instance_type type; const struct vpu_instance_ops *ops; From patchwork Thu Apr 10 03:39:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "jackson.lee" X-Patchwork-Id: 14045841 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 04EDE1F1512; Thu, 10 Apr 2025 03:40:20 +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=1744256422; cv=fail; b=FUrsR/RRhvnyTK7yx5Tns5Zrdx0NxjVpv/xrzBG6wSWqpu+LW/8CC1gdDbW9HqjkF70BI6l4wC+gaszEmfqdCOaBO0qmYCp8uVB7LALfj4E9ErzOZ6LugwVGWfxQbLJ3366DSCL57QRjRfIbzD1HwWtLXoTk54rbwI/AzgHvZNc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744256422; c=relaxed/simple; bh=YDtb6hA3MkXwhkAWMKx8x2lVe+YNO3jEo3ipHfMtjmg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=tX44vSM5Tr0QTCfjTk32iinpJFxEY9Zdn0zNVxxG5v8+2JMN0Fx/lMJCkHxDCqRtwLBqJ0uVcsdsON1/mhrSR0y7mzA7Ug57YjWjJgcOSeYTGAYCl42Md8Cd7/8BElgmfMXqvWMAeBTzHAAOrssW5vxFWhvM1AtR5lvRVM7Ncw8= 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=Xhug7nRB; 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="Xhug7nRB" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qhlUoRZyfbQ42Gy7Ejb7ZjxXd40URNbW0Rr4t0v0pA9eeQgcItf4P0j+OD8j2sGRHEZ6WMHmVdn3d7rAn4uuxiuUnXM6x6bsQoz+70YZitXiFShy0H+RxBnuWzogQd3wypmcxyqYhx6Ir4dgEV7upmLe9JQs0CF6hxIcVbC+8WU56phcc0JeQrYnyOHHZPnxV6hM8Wb0g/rp/2DEIDoxld1NShBmEjDmsWFq6MLJK4bb/kbWnQTwtobNBQNap+1wtvIFWeaw9ZgCENDoFAp2VBQMUc7LQUhsJuv0UC2RMxj42Qp5tSNsmVQfAOKpkdYHaf2MXRIBOxU3pgT+LiVUag== 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=EVzA4eS89mDZTmuHVNKAWpZdSLSEAjHSO4ywkKF5RC0=; b=aAEHfAZ9eqFbFxkPl66/KT+6TN1x/i9JynixyuXH4a3clEjCHYE2Ej1Aegwf9QtWHaaJ8cNstChMuQ8Z1hUG8JVetWQstFF3D56QgbKdKWxjtBRf4KYhD4Ph0yEeUJ/4VruhY4mWXHoCUyeLGW3Ajrl7hC9Q1zT+r1P7jGJE/nqlPopwcFrpJnY/8oJO7GiZhXRd1gP62fkB962lcCj+41g7EVc7TyMXsaM7KE4+Qzq05cJC3SPadhejLhzqHgT6/w6pU9n3oyNSl1yXFupuqMHlu4eUCLYGFa/L2WHEMdAVJyLv9oyqrxCvcxAWKxJBVjVq151wystq4u1r1dfHRQ== 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=EVzA4eS89mDZTmuHVNKAWpZdSLSEAjHSO4ywkKF5RC0=; b=Xhug7nRBvrIh9y4GQ4KoR1q/VzTSI4fra8u7fEMR6M71buTASBrfffkJ/G44OMe6CfujdfHVrDwwhF2bbftAIpDbtgO79N90SrlLsV+1i/TCzYEsU3vEXvdKDubZ+XXMbjeLK8CF4PiVsrUg9YX0mwWvV2zpeW0eU9OjXyDSKQI= 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:11 +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:11 +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 2/7] media: chips-media: wave5: Improve performance of decoder Date: Thu, 10 Apr 2025 12:39:57 +0900 Message-Id: <20250410034002.88-3-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: d60fa6ff-6255-45fe-6ab3-08dd77e165c8 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: P8JJgPfjlsspHHxkU0vAwLMgMRXp5+MVWkzCmpB5y5d74XMV9Jqo3/MBRb+USTZ74gsoyF3XpgWokJOAaRZYuwXxeJtuweCTpHeXUMsm/yDGLf3QAtkf+FPdfxI62ckNkICQc3ieUKUQmV0/bEm2C3sGYnPGVveGVs1IR3QsAxN0QRh72su29dPbWeEdC6qqHthnQ66EmHFhN+qGG70/oYxelmhpFKeisYFOXO1kSykFJaXjwH40HHhjTcdIV1udXuG4k4QSwGCkEQh3IVvbbj6zk99wwk1q23AnTnNa13tAXEGbxqEJ4XxZPCjjs4kcgHJmQ/B8LhdtyZykAdJhDtmbLS20hElKMWcFO8z6QH+K1iYuBe4puCSAhijA54AQUCagPN9DluudUC4rGtTaQrm4MakueCVontcrL1QUfZbq0tpA3mEmepsgTB5xGGEnVr5YTyJ/BHlH7ciVfQdtYEraUWWiNI4bDawC0dIlI+XRAwztQNhjyTkxIQVJ2+YKDdTzjDkloT1by3t7wSRFBQiwJEQKO0aB+F1p+pP621gNNH6ha7431/S2SOMRJ/ftLAG8WDqFTpFVmujfpMbZjNsywjvgNowX7qtXAm8+diBWSXVLEpoD/ZBhX1847K76kujPSypVd8SHGP8SVpDCnR0NLCl1IWeaTN1ht3ioDFFO77IH6LpvZJkbo9GDqOC6Uf1IYZ+Bdj98KOawNJOrRJI76IQTs3BwsF4kSpeMPOk4BoMrzgQ5s6W8qd/HokAXJcPWoQJMi6fhKpS+0e6gHuS9ijaIjth2mp1k2hZbE244bfeY+ZCgR5WZZVpYGL9WvI0JxzytmVHX24lfGKQmZCr2ruMid1GHkZsMJTU/dI1MX1brBX0b9yZ8qAV9mUyO5DKwT4MO0xaWsnJ2Zm4RtmrsAPljd4sA+H6Budk357T/6jWAwjf/SXgg+j2UJAtRPFEdvbkauVnTWDq81fuXq/q0vwApQ8TT1FAkLMgsqOtlUfndsZeyGyH2KE8//2iCF6sKLDRL92dZlxXR2iNK2xYO1fWD/sPAVSKy+N7SViwdCwya/vNsJ2m1L3w7g86TpcaHqIpufYtFW3Bo62kszOHiU9JwJWyx3ZA51MJ0gKpuXxRI8vLMJGaW/bLHQnzAsLTLg7XqnTwyFmSvGamV609tQxgEOw78GpBzJfQrb8057kSxXCbd1vPLuXaNRv1loH5BkktY+dO1IYAzaOaWkm4WV7E2VoU1omsAHHVQpVWFMCPpFqw2iM4kX3wu96tjwfcAhnNwP2+du5dm1FlgoqsNLBQ9I1xrQzA++4pHycSRDYsWp9oSwrSIcGk19flKyz3Yx+uBApxaLh0nwIoWzKUaVq3c7D651yRU6xDGItD67l4xPBjTPyF0envmLkEfzp58DFUTVdW9zmCEtLUGjyFCMlCVWN/YJSPm4FGQd3raFItXUZOLX3Pg/EkU/qgn 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: FUZw35vyrYrLxVAvoW5h5bIHcS2BCwTWiTmRlELrP9+PDgxe6j8Zo5bf+iZUA9DLFyi+CIF0Uz0U/mW7WykYC+2IUUJNgbEvfL0tqnBjaUi7ZhBEI19i0iDNlgSH5L3dIv9f3sm+NBJ0h21aAzj7u8/WW0qIXXxyNy8Y9oPor/Fa03UBm6pBHQIkm9VxoLdCtHHWcLKPgptn4ti5qe3yZkBZBjrpR1PldYnx/a7feC0NWDVgfQ8sdMpbTlSRVMF1rLt2qfQD7TBTcT9yeXoGFLe1YOfQ0uHHwcORus/JpqlGxneYNh2ALpZtT+kJK0E1DkT9nlUOZj3LUpD1+tfPV3WzJWMLZ+0LYcRwAv3vjJ8MT8zktK6MkXj/+Yo9GNfsTAsxcDW4L//Z0qV2Q24a1H+a9EJB25i432+z1SwPRREk9fsl0WcyNITGZn3Nj/3KsCU+0KSnZxOXxL2RQAhuiIf2nQ+A1Dr1+ZJI131ux44ShOZalB3LBCB35gPshXgGPHLSp+XQzFJMyznUUKloIxmyD6e+WV6rQUDF4ssx4bnotaXCczFSR7roYUsKHr3EDZt4aF6e5YUoo9hOJWnNzWLxoU+UIQmyy+gVe44COQ7vHb8/1L+seYoYFjH9FIt/fr7k8VYwmpXtw3tZ+YkhyLxTmRZkJbzISXiamMqkg1520FpNjaFcMdNoze8jb7U0Lu1FQ1+TdAyPcOP/PvbEuDVkr0XPig7DyLBukHRuORN/WUnAdQNwipijKR/IAXWle7MatnVCP2BYcUctn1CCBauW2/uWUo4mb1lqjTZDWAK/fVcNWNecu/tMEXNfm0qD7MKUuxMNYw8UTCDHYUw5viN6LjJkGPTXTx+SfR1d09yjjCFR0zyRkcfKhuJTBQryLOFqPYbf7bclY2J8oiyDlavFdqqh73f/Sv8nvdYCSjMOG8W0rQc+rAWARmCxyIDdNHru8umcUPy+qkwoWeAVybQ371Qby8gZbEAALPq6WUQrDZriQ6yW2Fd/sTtPtbeCkatECNjLlqh+1vM4dRpmbNS8ze5JsabAcr2nALMSQgox0puUptoVhKghjvckOeUQOzjaPFbyFI9u2TRpE6rTpqnbVt7tioufKTS5gcrsOf5Y0WqhOov6pUd6UDKniXBILayaIEh8VDNKNnSlUxob86QcycNRXQ45lzW4EWSq+7YxNfQfZyF+4avXqXubA+34OIomPwQMkdcaDkf8zUPP+Pj9AK2GDQLKnjn4wbf7H3IwX/d8AOCpnwhQP3vjT23+vu5Tw9GtepDeLwX+Gwpk2E11I2KFpxCmcImiDU6QAYS7v6NPkVCBzIl/NKxnlFZt2p3054MaWKC0t5BipC/yF+cdYfoedBOpZnpk+FiMy7qK1v/HjUWtJ4KNuYhYJDbPxf2QTmQPBhAYxYcdX2RN8HZmqOVXBa6oT6gK+9UZ6TIAt75IyKGVCnmWDpBOUQiluTTRw0Vyqs73ssUOxi1L9dKlEabDOaChYJiLitzX9kfGDt9zU7RAeZNxTyhBDOTDBFZKkcKV9nBZlZvRPRg/nyj9xasABQXDhTtUCuIUkwnXhNXMp8AINuhER7m+YZ2HLzXdM5W+5c+Ot8SXH2dZnA== X-OriginatorOrg: chipsnmedia.com X-MS-Exchange-CrossTenant-Network-Message-Id: d60fa6ff-6255-45fe-6ab3-08dd77e165c8 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:11.6645 (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: QSd06zexQrHkSoYwtfQZynSKKoxDJPL2GrL5Cx3Oth8KKZwn5UvZPJBAHg21mG8YDk6wMKhXn4m20cyu7dn+zd3khvyP4ea7Pk+c/aG0fJ4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU4P216MB1439 From: Jackson Lee The current decoding method was to wait until each frame was decoded after feeding a bitstream. As a result, performance was low and Wave5 could not achieve max pixel processing rate. Update driver to use an asynchronous approach for decoding and feeding a bitstream in order to achieve full capabilities of the device. WAVE5 supports command-queueing to maximize performance by pipelining internal commands and by hiding wait cycle taken to receive a command from Host processor. Instead of waiting for each command to be executed before sending the next command, Host processor just places all the commands in the command-queue and goes on doing other things while the commands in the queue are processed by VPU. While Host processor handles its own tasks, it can receive VPU interrupt request (IRQ). In this case, host processor can simply exit interrupt service routine (ISR) without accessing to host interface to read the result of the command reported by VPU. After host processor completed its tasks, host processor can read the command result when host processor needs the reports and does response processing. To archive this goal, the device_run() calls v4l2_m2m_job_finish so that next command can be sent to VPU continuously, if there is any result, then irq is triggered and gets decoded frames and returns them to upper layer. Theses processes work independently each other without waiting a decoded frame. Signed-off-by: Jackson Lee Signed-off-by: Nas Chung --- .../chips-media/wave5/wave5-vpu-dec.c | 82 +++++++++++-------- .../platform/chips-media/wave5/wave5-vpuapi.c | 2 + .../platform/chips-media/wave5/wave5-vpuapi.h | 3 + 3 files changed, 55 insertions(+), 32 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 32de43de1870..192556b91aaa 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c @@ -347,7 +347,6 @@ static void wave5_vpu_dec_finish_decode(struct vpu_instance *inst) struct vb2_v4l2_buffer *dec_buf = NULL; struct vb2_v4l2_buffer *disp_buf = NULL; struct vb2_queue *dst_vq = v4l2_m2m_get_dst_vq(m2m_ctx); - struct queue_status_info q_status; dev_dbg(inst->dev->dev, "%s: Fetch output info from firmware.", __func__); @@ -441,20 +440,6 @@ static void wave5_vpu_dec_finish_decode(struct vpu_instance *inst) } spin_unlock_irqrestore(&inst->state_spinlock, flags); } - - /* - * During a resolution change and while draining, the firmware may flush - * the reorder queue regardless of having a matching decoding operation - * pending. Only terminate the job if there are no more IRQ coming. - */ - wave5_vpu_dec_give_command(inst, DEC_GET_QUEUE_STATUS, &q_status); - if (q_status.report_queue_count == 0 && - (q_status.instance_queue_count == 0 || dec_info.sequence_changed)) { - dev_dbg(inst->dev->dev, "%s: finishing job.\n", __func__); - pm_runtime_mark_last_busy(inst->dev->dev); - pm_runtime_put_autosuspend(inst->dev->dev); - v4l2_m2m_job_finish(inst->v4l2_m2m_dev, m2m_ctx); - } } static int wave5_vpu_dec_querycap(struct file *file, void *fh, struct v4l2_capability *cap) @@ -1146,8 +1131,8 @@ static int write_to_ringbuffer(struct vpu_instance *inst, void *buffer, size_t b static int fill_ringbuffer(struct vpu_instance *inst) { struct v4l2_m2m_ctx *m2m_ctx = inst->v4l2_fh.m2m_ctx; - struct v4l2_m2m_buffer *buf, *n; - int ret; + struct vpu_src_buffer *vpu_buf; + int ret = 0; if (m2m_ctx->last_src_buf) { struct vpu_src_buffer *vpu_buf = wave5_to_vpu_src_buf(m2m_ctx->last_src_buf); @@ -1158,9 +1143,8 @@ static int fill_ringbuffer(struct vpu_instance *inst) } } - v4l2_m2m_for_each_src_buf_safe(m2m_ctx, buf, n) { - struct vb2_v4l2_buffer *vbuf = &buf->vb; - struct vpu_src_buffer *vpu_buf = wave5_to_vpu_src_buf(vbuf); + list_for_each_entry(vpu_buf, &inst->avail_src_bufs, list) { + struct vb2_v4l2_buffer *vbuf = &vpu_buf->v4l2_m2m_buf.vb; struct vpu_buf *ring_buffer = &inst->bitstream_vbuf; size_t src_size = vb2_get_plane_payload(&vbuf->vb2_buf, 0); void *src_buf = vb2_plane_vaddr(&vbuf->vb2_buf, 0); @@ -1220,9 +1204,13 @@ static int fill_ringbuffer(struct vpu_instance *inst) dev_dbg(inst->dev->dev, "last src buffer written to the ring buffer\n"); break; } + + inst->queuing_num++; + list_del_init(&vpu_buf->list); + break; } - return 0; + return ret; } static void wave5_vpu_dec_buf_queue_src(struct vb2_buffer *vb) @@ -1236,6 +1224,11 @@ static void wave5_vpu_dec_buf_queue_src(struct vb2_buffer *vb) vbuf->sequence = inst->queued_src_buf_num++; v4l2_m2m_buf_queue(m2m_ctx, vbuf); + + INIT_LIST_HEAD(&vpu_buf->list); + mutex_lock(&inst->feed_lock); + list_add_tail(&vpu_buf->list, &inst->avail_src_bufs); + mutex_unlock(&inst->feed_lock); } static void wave5_vpu_dec_buf_queue_dst(struct vb2_buffer *vb) @@ -1385,6 +1378,13 @@ static int streamoff_output(struct vb2_queue *q) dma_addr_t new_rd_ptr; struct dec_output_info dec_info; unsigned int i; + struct vpu_src_buffer *vpu_buf, *tmp; + + inst->retry = false; + inst->queuing_num = 0; + + list_for_each_entry_safe(vpu_buf, tmp, &inst->avail_src_bufs, list) + list_del_init(&vpu_buf->list); for (i = 0; i < v4l2_m2m_num_dst_bufs_ready(m2m_ctx); i++) { ret = wave5_vpu_dec_set_disp_flag(inst, i); @@ -1580,10 +1580,19 @@ static void wave5_vpu_dec_device_run(void *priv) dev_dbg(inst->dev->dev, "%s: Fill the ring buffer with new bitstream data", __func__); pm_runtime_resume_and_get(inst->dev->dev); - ret = fill_ringbuffer(inst); - if (ret) { - dev_warn(inst->dev->dev, "Filling ring buffer failed\n"); - goto finish_job_and_return; + if (!inst->retry) { + mutex_lock(&inst->feed_lock); + ret = fill_ringbuffer(inst); + mutex_unlock(&inst->feed_lock); + if (ret < 0) { + dev_warn(inst->dev->dev, "Filling ring buffer failed\n"); + goto finish_job_and_return; + } else if (!inst->eos && + inst->queuing_num == 0 && + inst->state == VPU_INST_STATE_PIC_RUN) { + dev_dbg(inst->dev->dev, "%s: no bitstream for feeding, so skip ", __func__); + goto finish_job_and_return; + } } switch (inst->state) { @@ -1639,7 +1648,7 @@ static void wave5_vpu_dec_device_run(void *priv) } if (q_status.instance_queue_count) { - dev_dbg(inst->dev->dev, "%s: leave with active job", __func__); + v4l2_m2m_job_finish(inst->v4l2_m2m_dev, m2m_ctx); return; } @@ -1650,14 +1659,21 @@ static void wave5_vpu_dec_device_run(void *priv) dev_err(inst->dev->dev, "Frame decoding on m2m context (%p), fail: %d (result: %d)\n", m2m_ctx, ret, fail_res); - break; + goto finish_job_and_return; + } + + if (fail_res == WAVE5_SYSERR_QUEUEING_FAIL) { + inst->retry = true; + } else { + inst->retry = false; + if (!inst->eos) + inst->queuing_num--; } - /* Return so that we leave this job active */ - dev_dbg(inst->dev->dev, "%s: leave with active job", __func__); - return; - default: - WARN(1, "Execution of a job in state %s illegal.\n", state_to_str(inst->state)); break; + default: + if (!v4l2_m2m_has_stopped(m2m_ctx)) + WARN(1, "Execution of a job in state %s illegal.\n", + state_to_str(inst->state)); } finish_job_and_return: @@ -1755,6 +1771,8 @@ static int wave5_vpu_open_dec(struct file *filp) inst->ops = &wave5_vpu_dec_inst_ops; spin_lock_init(&inst->state_spinlock); + mutex_init(&inst->feed_lock); + INIT_LIST_HEAD(&inst->avail_src_bufs); inst->codec_info = kzalloc(sizeof(*inst->codec_info), GFP_KERNEL); if (!inst->codec_info) diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.c b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.c index e5e879a13e8b..68d86625538f 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.c @@ -255,6 +255,8 @@ int wave5_vpu_dec_close(struct vpu_instance *inst, u32 *fail_res) if (inst_count == 1) pm_runtime_dont_use_autosuspend(vpu_dev->dev); + mutex_destroy(&inst->feed_lock); + unlock_and_return: mutex_unlock(&vpu_dev->hw_lock); pm_runtime_put_sync(inst->dev->dev); diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h index f3c1ad6fb3be..fd0aef0bac4e 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h +++ b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h @@ -818,6 +818,9 @@ struct vpu_instance { bool cbcr_interleave; bool nv21; bool eos; + 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 */ struct vpu_buf bitstream_vbuf; dma_addr_t last_rd_ptr; size_t remaining_consumed_bytes; 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: 14045842 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:39:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "jackson.lee" X-Patchwork-Id: 14045843 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 225C9202979; Thu, 10 Apr 2025 03:40:24 +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=1744256425; cv=fail; b=bJOJUn33rlYYS4dfNzesmiCqDAK5lefUKvfRvyenoNKmc+mG/ys8sCI3zg/zArgoteZQvOD7ghLpaQR7pol0lN6+OKkjXNtKhLlmTPYEmRmzUJhs8vvXeVwy+tVO9BV/hSzYcV0XZHfvglo6+BhPJQMIHufwYaKK+AlBCIT8AlE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744256425; c=relaxed/simple; bh=Ik9WKF13N07blOblz661ZgD6mKBNeoY/0oMx6ZlcT70=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=YEWLDxWIfMBLUJWmHQbRznRegCD+rTUXmLdxzaV7ACB9DGouelHJWCRrVQ/fHd89W7bn+z3BO48PNvFWwR+O4ka9RvztTHjlCuA4n2BDKPWpHa3Dn5niJ46Hh/ucPoDQ3b0nvIptOqDK1wAbuu2q1BPZ1DfsYkydy01JcgevP6c= 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=V6E0H16F; 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="V6E0H16F" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=neAU3vl3buGQUAUlY1kvMwUNK5nwc8aEyoxfxC9OGtkmYZWU248LLDr9YPuDOWWiJtQ5Ziu8AZAjH8jgPdiBplWAjzIxvI9gqdFlBNF4zlcknsNpgXqlg6GHvFhE0bYfg7joax9dklliF1mB9c/w3LotFc6Kfv8ARjAF2vLT3NCpJ0PeAUpo7hBPOteLTdGQ3NQ9Rpq/YLCBhzrZstEQ4oOd4a5rGUyYN2o6amjjXIZIBu0Cwhi2O0FIVl6U6lJ5BZonJm+EjjQo4gu3NCvy5U2pBTYz6UPqCDLsHGps6CwT/SyaJZlvTV83mRt1MRZnjOL3RwTaR82mccLUyNhtFA== 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=/cmghElbMgWV0U/7xBb5cJpCTSBslUZ7KGLFXsxFmi8=; b=ZbxoDT+LbELUTPy7vQgsdxTqzQAgEIh735PUQoYzV2lSZ3P/8L+OgzZ4rUWJPRnJcDpWTQJTsS9RIulUgMMT3fAvLEeprn+XrPMvNXuEy7eXi7bH3k/YM6ARHOe1luw2sC36ByUoqNbt3VVTtZSBJrxFPqkeJp27nwXJ30a0scXlNdy1dEXUdkeYS8zGJYEk3IutvZLvSvfiUKz+nWhKfRlKK4RvcRF5j8Usihp+bWI8p05ulfGP/X4aaF7yin2GW+0HvuK7SdHXfzfPxDInsppTRiEzPdSdRW5Wj9I9KthyDdzwL2p43UgynurGMaeJZFdKC46b2nNT/a25sR70UA== 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=/cmghElbMgWV0U/7xBb5cJpCTSBslUZ7KGLFXsxFmi8=; b=V6E0H16Feu7yYlSCbOZeqIpruoH3t1L7lIGaOhJRwJR8pAWVMl4FDkFNoYP3KFxuxZD2YTXeTFw8zdMDLr6XTjbTWFVE88K2uYd0R7HgXPVkfAtB9AwpdKhkBwqtlHTP3VMNy7aVJZqwx/kuPmjuX0KY6QI5oFKOMT1ZmCIntDk= 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 4/7] media: chips-media: wave5: Use spinlock whenever state is changed Date: Thu, 10 Apr 2025 12:39:59 +0900 Message-Id: <20250410034002.88-5-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: 15a2bb1f-75af-442b-823f-08dd77e1663d 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: mGCtRMJZZfkmvBzn3Q0ZqQijWRc1Gt/JMLfw59gnjo1MviAUxLUEPKSYqlXTXt50zqjN9KZ627ZtEFlj+dQrfyspAhwTlPSgQmaRY/JmNicpkglVZpoisCYMU1pVvzNUsZwDhJFJr4gzA6Q+SwbZ4mb6gS+mRiKBjNGNul1hL44CxsPlUn02NY71KfVWPm4HOHDIPk9UUCwBXYWqdNt2/3jdkI3jfCLwmd0YZ5OFh6vsD1iZ2iMQ4e1KPa9rS2ZZMTcNbE5lP0/vrfkZUHReE2YtIBpFoB2tzkPp2lQdFeUdc16RO9Lv7U3AeGHPWYakodA71PUmf46XXfY5vV1HEeBFki1ddTcUkJ/UV6kp8Ji08ic4puyz94vof97ck8DTEZtFzMMqkK+xPKa8KUa4X+MC/7dAYZxoVMmjmTkRUomWCgsZyjOghuL/daLB+CTBXN4HDGfjf8Ewxge3Me9Jx0soLehbZgHAO93NDW+drsDdDFiyA82h1lgX3AHz/oKnDXzTSbxkTPLOfrpAo4zB8uiJH3W0cMPylY7OJdwmxt4Cxx2+IUVb4WRmZNkWOKOM8LDRDZAYWO0P8cR8GPcZI0W4OIZ9JxnqUhKzCjZE//UkX/AjvjOFE8XP4WXq7Srygw/ZVssAgHnyz8KZfda46M6453uFtRWDt7dgZtciDhW8qe/ulK5/YGj7DV57lr6WL5/4j29ypVZEnlD6ZtzpIUraReSAFWg883ZierZCOngtaHbklwAgO3Nc2hrnFIzurU3xqswWnhI+IiXqzskb0+vE/gWMDZv9C3k62aF+a+hHkPLU8uYQU3cO183/J8OAYhhPcivIfkrM55jl0DaHKQCy4SrHprT6eEL3Bf+22c9pxe3FPrSrTy40lzoOMH2ohPDnR3QxJSdRmAHqkjnYngg763ToUXrBzNUuA8zOwmZQcIQf7Keewkag/WxQfUAiWjvzjwwOjHuEOfjmyjxhmv3z2MAkU6+xE4TtbJqatfU38BIAKW54stHTurEe0yRiBpO3il2H/mYyHL57pHTm8bIJ6EcVRPStpIHtVCHHKxpoBRfaamCg3NP2DwXgXnoUKczARNUKo5yxhErFByC3f6yqdznEfLcvaPNW59wX0kQV0vOorw3fLjOs7q7e7i4+3VqyvK8hRTcHlPDhCPafhK0rVmy5/jrHsjdOnzSn+n+gZu5i6jBNrphxdi6onIftAzPFPJNMYEF1LhyskScBjPntfEaHCDIp7R6XMMI2zrlb+oaojvSmlIP+mSk40JQeDkI5JlOHtOVbv2vhxEDfMWqWtqKaLlfkAkm7CddjmE2X8enQ9bNX5E58Sz4vshBqSJ478nXScJkYeFQU/aIluChjtAQNQUFyp0EiVXQwo1eRsoxrd3Zmz4QlEbLXhJefi2gWZdSnTr1qJHu7+Qb25EdDZvR8xh3yr5P3Gwk2TJz584xM2n9vSIZrsnqEiB8U 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: 22XuU1xcsSm/wnzdEKthisodiLzA2weUj7cyhfSAyGPeBVCKRukxXbzgGJBf61tN3K8luItW/vgN4Hwg7k0yGJXYz1yMCIjEZNOCndb0fArDhvqJnuwbAQKqNx3vYKE2I5f4yoeA4omqb+HDTGdc/78w2TyznKUJE4CpDf8dU4rx8e/0D3UwZcq/JAS/l6Gv4fORMjLUu4ug8viVOPe/xcGiXs3x4Gq6szs44OfM22LR6W8lICqXXWtJ4xLYCwFuK5hwnd7yci4rYCwmo7Xmow+HRnww025JJOGUyfVy6X/sT3hkEGcukREK1mCZPJkqa38QXXxoW+oaJih/mIYC6Mrlmr1rkhCEPMiqqxqjnGSjR9xQ2PPr3ne1fpQlJcqxiEIlR2HHwNQPs/KYgnYFoTPPZe8Vy8UEwaQnud2lKnJPXKU3sciLtDJaH7AvhKiQ+vRa+oXAWtKvLG9kAqTfT+8/XpI1nH+n67rUpM3pNCc0PPhUaPn+JPIqwVQgR5kNf552/C7rf7MSxWvXsoaiVc8srwGOT/ZweVLtl9iQDoiDS9Tq9DYeHdzxmP5UqNoAP4FlJ6OlkhKUTqvURHOEWv+m1AjpI9Bb/B+fJiK2T43/v7msgbOZwq7u/kzM0O6ejnmBwgb5VONN06kWeHGeMla27d9F/uQ1J/Nnm6QYMOy8YotTvUyfLiej41qAF6epXn/I1ADnmD82x1YRXHYjbhrXd01mrFFnpO9Bnw50vfxJPJQVryZF494o0icfilwcCvqOFYwiQ2D28JFXhiMvIdec/vjMx2nsNd2nuHFgFyx4pbGvoeflcn7DzXgGMvxqM9AaJ9gTs88cWd3f4qkVwv4tvE6JlmwSox/JGGW+1ZwINOffG3ZU4UqGBGPQtXGmj/k8OePIQ42/u88W9MjAuIr0/pT+3P68ZaVG0o+hRUCs7sObqSCDECB33Alh1uxCjE/ZudoHQ3z/cyWwtJskk24+ahIz4Im9dtq9VeA6hUixHbXXW6zqBt4c88ZXdFw9d8UvC25k1aPyHzSWtWjk05LfE4Xv7B9+gc4jb8uDLbApQOuxdcNi8ZVpdB1sWIhDY56yfjFclhqghbc4ezDMd+SxRU0ec2iFFy9LjVy3SesMalC7wBNw8KEfjDouOQ0Johzq5UMBb7N6UxVDMTEb48Hvg8RxEvxfKxLpjSEzCIDemGAQXVyTli0yKhuRnjhdp4tScZY0BYTWWzhQ1TVAfTLb50DtbXCPsQyLnWRpe2FuZB3kL6gNp+r4EWvE8MCCU1gsdl9HFRuvpW33KWFVb7bPxKDX4DE4lK1Pq7rs6MNYMEonD0xUm0xKdstpUAWWb1+gF7+3Dq6cyFcvH09TpYsAISCR6//t1wpAIV0TNiK4pkbPgw3/j9X3vFi00phjreIXr1/R9OegZgmdgLm2/eqDTMHDQ8fxxlJZ6CRz2l196vtOoO+RDMAiAPHJj6cBeqQqCqlXtRXk5wY6vylmWoqJ2JTWV3NMvPXDPElRZ50mTlvI7qzyboTMvxyTfhjAGZG0K8O7ouI2neSsDPwI93NIZHVxeDlEOevUtY24+/g2o+spyQChJvKJD/v8e53F0y20yJlK0BSZudWcdYAjOQ== X-OriginatorOrg: chipsnmedia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 15a2bb1f-75af-442b-823f-08dd77e1663d 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.4093 (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: i+V03oXCyvDcdjaVk/zJqFF+7yVkr3un4nC6gVVofJ327JFsZPr/H3MH76r5l9izcG8xGteDFIwigD2T/qB4JQtPMZJcCDedWLzFgcM5EV4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU4P216MB1439 From: Jackson Lee The device_run and finish_decode is not any more synchronized, so lock was needed in the device_run whenever state was changed. Signed-off-by: Jackson Lee Signed-off-by: Nas Chung --- drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 e0f4b11ee464..485320db9bdc 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c @@ -1577,6 +1577,7 @@ static void wave5_vpu_dec_device_run(void *priv) struct queue_status_info q_status; u32 fail_res = 0; int ret = 0; + unsigned long flags; dev_dbg(inst->dev->dev, "%s: Fill the ring buffer with new bitstream data", __func__); pm_runtime_resume_and_get(inst->dev->dev); @@ -1617,7 +1618,9 @@ static void wave5_vpu_dec_device_run(void *priv) } spin_unlock_irqrestore(&inst->state_spinlock, flags); } else { + spin_lock_irqsave(&inst->state_spinlock, flags); switch_state(inst, VPU_INST_STATE_INIT_SEQ); + spin_unlock_irqrestore(&inst->state_spinlock, flags); } break; @@ -1628,8 +1631,9 @@ static void wave5_vpu_dec_device_run(void *priv) * we had a chance to switch, which leads to an invalid state * change. */ + spin_lock_irqsave(&inst->state_spinlock, flags); switch_state(inst, VPU_INST_STATE_PIC_RUN); - + spin_unlock_irqrestore(&inst->state_spinlock, flags); /* * During DRC, the picture decoding remains pending, so just leave the job * active until this decode operation completes. @@ -1643,7 +1647,9 @@ static void wave5_vpu_dec_device_run(void *priv) ret = wave5_prepare_fb(inst); if (ret) { dev_warn(inst->dev->dev, "Framebuffer preparation, fail: %d\n", ret); + spin_lock_irqsave(&inst->state_spinlock, flags); switch_state(inst, VPU_INST_STATE_STOP); + spin_unlock_irqrestore(&inst->state_spinlock, flags); break; } 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: 14045844 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: 14045840 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: 14045838 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);