From patchwork Fri Sep 13 06:21:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Qian X-Patchwork-Id: 13803018 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ED328EEEC31 for ; Fri, 13 Sep 2024 06:24:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:References:In-Reply-To:Message-ID:Date:Subject:Cc: To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=U0y3LdCQc+eydC2gY0PuQdPfvj6redQGQTPCv1VhAgA=; b=mh07jhjxK6/Q2b+GvPx3NAkVls 7QBwKWtYd993+md0vLNvW4nhWfDouyFSO5lfUIEcb5XG7h4P4GGldEscJkuCMqiVhOQE7P5g5Mz29 SAI9c5aCu7mZKuNx4xV1y9Y853EAuveRTnroOcHwsAaSjQ3XivzzLijNpeZ+onbPtGH/vFcU8A7ke 5G/XFdCbrMyKotRHi13j5VS2YZWtJX5+0I0K6d9V/XWnRsRxSQckPz3uFSc8fB9ukI0SBEmjIDvnq ZVueBlUXVBpyKNM54s1nYvH59dCdkQpZCHPbMsakO6IB+4RelvPrLyarcYxKD+ncVNXFtrRu/vNmE cBLK7KeQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sozjP-0000000F352-3FNr; Fri, 13 Sep 2024 06:24:35 +0000 Received: from mail-northeuropeazlp170110001.outbound.protection.outlook.com ([2a01:111:f403:c200::1] helo=DB3PR0202CU003.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sozhJ-0000000F2hW-2eFA for linux-arm-kernel@lists.infradead.org; Fri, 13 Sep 2024 06:22:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GIk76VT//l8r0bYB26LHbUm11aBtXMpCOyXbT+oaeKtiRi5ZCurYOw0NhATRDOzUvbFJLqI1rt3lEgYfdyBnoiRyErbMIiooiz0EmqS5BA/BTZsB6AZGdhwNlWHclrEi0PDK9R/l+b/uxHziQtErZsOy5inx5bP7ZAOwo0R2G69WOcRnN34tR71WIs9utWdq71n7VJWd9GbsnrIz9j/UZ/97SkLupY3Rach74cv8LtTxLwwKmhiT/YbmXmX0rPiZEyjrFzZWgOV846/B9bNJOsI9tWP3thhFBo8d3efKbafv/uM0s3sfd4OFmuGmQyC8G9ZW75BbEqotKxXnI7uSBA== 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=U0y3LdCQc+eydC2gY0PuQdPfvj6redQGQTPCv1VhAgA=; b=lk1q001YCN3d0VHVEGDFs693NUwYzxWcFhniHDi+3/kH+G656AapdZesRF0qp3Jw8eqQ1N+fxw067zQikZHshpxckREFlCI1xj/avIfHrCrz299ulW8dsYFhP4PnrAkbQOK2VoWW8zKb0gF/NGwOF4wSTwp5FYrR3g4t5lTnuKK18Y28mAKv0Ip4z1Iab6wW7j+60Rm9+dNGbyWf+3sTttG365Uae/G9KhsDLp/JIMZh9hPShMZ37+lRxtYCbWar4shqHKlouQGiGas7r9B2rtETXlLf77Ply0dScQx28fLtAUlZ/tZhjr5XsmBjA4Yg4mvw8fq5EFGhIDezh9MyOg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=U0y3LdCQc+eydC2gY0PuQdPfvj6redQGQTPCv1VhAgA=; b=msMXBD8iR6QgHV6JR3xtDywhv2Eyv1DpY2MqKL6l1Mziix0yT+bNGfm8d30Gj1Hc7BmWDzOYVdoeKsgdEPx0maXpsLJq+awqhPDs5U9KrnMgj/NMRjuk+mgXn1ztdsN/NIEYnSdtUVM4JPL5um2V9gfdMBUpO8fTpnl5SYzJICtcTeACi3EcQoXaU7hGE5ntWo5XGwfcoX0qnvxEv3diym5Upw1nLw1EmkZTwRc1lyPnZFSAtsR88hKJToR9SaxlrOuAAeFRoDxwvIDgZ7AB4E3lm3ZwKhQr/YtH0/cKFY0/txigONXrQiw8mv2Cq+76JEhC5yImYE4yMOtHlBRW2w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB8254.eurprd04.prod.outlook.com (2603:10a6:102:1cd::24) by VI0PR04MB10856.eurprd04.prod.outlook.com (2603:10a6:800:267::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7962.17; Fri, 13 Sep 2024 06:22:21 +0000 Received: from PAXPR04MB8254.eurprd04.prod.outlook.com ([fe80::2755:55ac:5d6f:4f87]) by PAXPR04MB8254.eurprd04.prod.outlook.com ([fe80::2755:55ac:5d6f:4f87%5]) with mapi id 15.20.7962.017; Fri, 13 Sep 2024 06:22:20 +0000 From: Ming Qian To: mchehab@kernel.org, hverkuil-cisco@xs4all.nl, mirela.rabulea@oss.nxp.com Cc: shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, xiahong.bao@nxp.com, eagle.zhou@nxp.com, tao.jiang_2@nxp.com, ming.qian@oss.nxp.com, linux-imx@nxp.com, imx@lists.linux.dev, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] media: amphion: Set video drvdata before register video device Date: Fri, 13 Sep 2024 15:21:45 +0900 Message-ID: <20240913062145.1885502-2-ming.qian@nxp.com> X-Mailer: git-send-email 2.43.0-rc1 In-Reply-To: <20240913062145.1885502-1-ming.qian@nxp.com> References: <20240913062145.1885502-1-ming.qian@nxp.com> X-ClientProxiedBy: SG2PR01CA0156.apcprd01.prod.exchangelabs.com (2603:1096:4:8f::36) To PAXPR04MB8254.eurprd04.prod.outlook.com (2603:10a6:102:1cd::24) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8254:EE_|VI0PR04MB10856:EE_ X-MS-Office365-Filtering-Correlation-Id: f0710cc3-04bd-494b-b49a-08dcd3bc6c64 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|7416014|1800799024|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: TCbGQxrMZkxCimCeFR9xQfiUeBm+AZoOYaMEuBJ2Ybgem1MRnfRhdyG85b4XIR1oypzIHYRapPyrmTf7RyN8CNaqZ7I4k/5ceJEkP8zG21i+IxC4uRkY9SO533II2KPfV3V+QXN926qLH5+NNqptU+9Wc0hr9eY6F+2Bf0HZcbThCmP7Ky5zijZkAw8MJhg/2GzzfZI7baWFi5h55oQaw8iQMsTF6+chplJumn6h45gPNKakDK0Mrm81KA4gz4KS0LAsdvaAemettA9JGjYOIaKR+Y2yj4DrYEisgblOsh/8+k5EFfy+cKGNbDnaUDRK8V6ouob8Oh15KSaD91yB6Ateew9L2DYooNtTRULezGeZT5JXSpAbJULjTpbdkl4XqKpOqS9Zz84PPeEYoknlzKEN0LaR7RXxBsuCIusDiFFtHGsJBB+EFarHotXnuu49zPUMWoBoGjGk24UFc+bG2tP/XU7e3wrmSgM4a5nPllMbNg0Pd1JFUV9uc04Cs5rpQ3oZOKenwDHv4X78SbSH//6PM35jgBdpoOfWW5/sCqwiyTggqiWKcjuDmC+4YzrgO7uThzcWAJKXbWeK7EsfTZ+Ktu2ln4NsdCbVpJd5r64oQoycJKboNdoVD6l0TBWav0XhSeBc3usq6p6H/jJQ39jaVsL/IDgLn57nh7vPmGgr8ZbpnpAaksbrR7tTTYvZEobhiQqFJifWopi5jXzXlFHLZ17mRsSMFpErSXILeWhOtG2+SRKP3yx8srwZdw9qVQqhZ+qhcxHguzKlFppL9GNvva+qrIoIK0WbtW5iJqzyqMMBOj8pXgNSTh3rb2tfMIQZAhkc8mWqcb5/8fczfWKhykT5nxMVbGazYE2gls2t7RKID2CKiW0F8MnTtbB1lx0WcXa1MhcbozrGYnKhzDW3dhnsrhgtsq5eRpc3kERVEiaB4r8/lrbVyAAfswJ6++S3iF/Us6Rs4yKqVet1C7sUnXHXCPjxLH9jHRKgFS/WRhJjFC8uck6ThP4LwNAsYb4gFubin3n7WZPUt4EinWJZmxK7TSikyXJcQd0qPKxY+bO1/+anADAy0pJjtmkPpfyQs5hi+ZnQvwLVFupnPgR/j0Kg3icxQSCNuu+1cXousnk6epieemThAgyLaw6h5CePeWbMxPHK9JEGzhdbJcvbBxXxEKvL74Hb3RjaXUZXO6WoqSP8rQWHE6pI4Fs8Ec70YPdV7OQ5yjUsBq1qDRl+20A+q6nDsAwXeMNMZ6BnAbKto8o+pXvWgf1Lmxj6+hxTHb//iWbtLwIyIOnmEuFxMFdu6pQ4uCa0BfkFuXuiYzcfIHMzSFzG9KQk+Vdb8YWLQ70P7SOTECqvtzn3tKp+IlmkDR63WbB+LwLyedGq2gn4blvoRB9aTFF+3zc8L1Yjib/cAaZj0VnasTpjig== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB8254.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(7416014)(1800799024)(376014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +3A1mWiOKn1ZM2X8lRkT4PAc0vKRRJo5be2IVESbDTpluDLSiu17fei+I/X3KdY+aFnHR37Ibk14mRtQiA6oUiYCMMvlIJ16DorJmicHILST0+Wsozo4J9l/v8YyJzWtreH1ZfCS+pgF+jvFFlZxKblnufR7et9SmA+oXAkxvPgq7Wvx8gh2mDZB5pyiOAeUZK0Blgnb77qsG4NTJ0Ls3iv5xKeXbsNDPoVycqVwjWCJCJVm2Uakevevy7lrTKR43OGnu8W5tDqWZYQZ7yM7N5fBwWGDqbCqPri9trqORJs52Z4OHhUwf0eQigiCtn8uchJuONDi8+yKvEnnrlyue2DRf7P0peQ7GKGAdVZYIYRfC+xIVzYHBaSifUEDQk48eCG9CHMTip4Vqe8tjowNuEpJoOvbUQstyaUhvBJZj8Qv2KHShQbWRaUADPbs9KRPkOOY9UpRzNluIwDF0+2j0Fb1ap03aeu7bbUnBXpOVO05voaZAIl5ZAq29qwOW+K5vEWLhdmGDSkInG+2/hSTOE97cSPKJJy9YcR0t6Gv7ImtVrHXnqYIEua+F4finXBXhNVqSic3en/oOqsJ/LvAAIwvbe9zOboI0YouCKxnoS87eQb7taJaxpFnAAl78AW7VWLWrhkosNdmlcF6AIcV8cKTiz8d8snFHqcZSYmQeKV+sZ2r+ebWlhj1lAr9OMu14cyUfE6Ea1uY93CUmKaebfP2nVecp1/yNCqulmgUHrsXHlrrwvnSiDa2Zl+ITsxytZdejo/WqbiocvYK50OG0ciJwZvs5NPHBE3W8XRKHhSNAtjSdkelMdX0bIFiq0DlAWG8WcGlad9G0ROsjW1d8v1ouD3+RtuJV0VU0UV+aordjNGVDrpTzugIV4RZ9x2u8F9qAcSvZqgeVZ28FV7T3TJTsoq7//dN7QFoMrAuL93Yyg8CgIoBimDSz/YzZStsTlGSCRdWe6pc3gR8+3gKsDohqCRtgHvW+hxkf8YdjSS/z01TZwtaBYG9NEEwmEe8fN+cdA0L8ecQ8SmTci9FVzNchcG6a5zszAZ14ZdL36Yzv4TL2GsZjrYKEHQgkjRrr5I9x23H3dEM7SmAJq1nd2IXjJWINSOymEFETkPkDC0FoPN2HhrQaWEyRU2wMvS/7hOMKzLev/IVtbU1OqGGTnDWVof2Oa+09ghuZVyWCpScPS9KysnpgK41FeSVaw2xk8V5TspANfUe86JeFXT061N1PY6bnuQMl4WvIWoXtW6kawc5hGW5Z8TdokQUhmmiuhUF+y6DVMnQDt/os7UYds1K0VV2r0v3Uta8BmXV72ZyfiWi0/CyqDxg/VJM9e77Ja+Ra8XJhSQrQer+2KRR8QLql+3xTRXyr6nE/ckorgDjXN1lwarbiK10Y3zj1oqyFQPVfnBN3adUAAoDZGGQMyn1Hv0ciYJ6MiYvrNAHS9TfchHEYguiDRjDqNY0gBr506WLIGulBN1AW/wiAsk5PZUG9lHEtkeJcIc33jY3kNPap6r2imxZkmoEhZ8Mlqe3LWK+BYEvhJaNw5mbYq97l+F6T98gH13rWYDaiAHM16IyPa/6GpFoIet9/ZouTITK X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f0710cc3-04bd-494b-b49a-08dcd3bc6c64 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8254.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2024 06:22:20.8767 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Eb5ZH8wP7e5KkB6hjsqGOJWTdX+zPgsCAaEa0Ic2r9hWRGK4rzuOug3x2ATk2bENjTcbl1co0ICnUmFDKvpsew== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR04MB10856 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240912_232225_696411_CCCC1B23 X-CRM114-Status: GOOD ( 12.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The video drvdata should be set before the video device is registered, otherwise video_drvdata() may return NULL in the open() file ops, and led to oops. Fixes: 3cd084519c6f ("media: amphion: add vpu v4l2 m2m support") Signed-off-by: Ming Qian Reviewed-by: TaoJiang --- drivers/media/platform/amphion/vpu_v4l2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/amphion/vpu_v4l2.c b/drivers/media/platform/amphion/vpu_v4l2.c index 83db57bc80b7..f0b1ec79d296 100644 --- a/drivers/media/platform/amphion/vpu_v4l2.c +++ b/drivers/media/platform/amphion/vpu_v4l2.c @@ -841,6 +841,7 @@ int vpu_add_func(struct vpu_dev *vpu, struct vpu_func *func) vfd->fops = vdec_get_fops(); vfd->ioctl_ops = vdec_get_ioctl_ops(); } + video_set_drvdata(vfd, vpu); ret = video_register_device(vfd, VFL_TYPE_VIDEO, -1); if (ret) { @@ -848,7 +849,6 @@ int vpu_add_func(struct vpu_dev *vpu, struct vpu_func *func) v4l2_m2m_release(func->m2m_dev); return ret; } - video_set_drvdata(vfd, vpu); func->vfd = vfd; ret = v4l2_m2m_register_media_controller(func->m2m_dev, func->vfd, func->function);