From nobody Thu Oct 2 00:46:02 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 52F892DAFBA; Wed, 24 Sep 2025 13:36:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758720987; cv=none; b=FtJh4gCosxmzv9PQ0WELNMmKM/njafXHbqHtKJF82cLdD/re5hDBQWhSuCmEWBq7IDXHT/jraHXdQWo7Q05Tq6CIEFePbBJISDFO3a4SdkuzKN78giwFwu91JxtF8V963vSoxWutmDyASybK3osCRksqIxK/zrCgCzBlXim9ZxA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758720987; c=relaxed/simple; bh=PP4GlelkN7bqBaOJj/FDhufoJKYKO3ceHzlIc1IQG+0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZwhHmVZpS5QASQQ8PMqOgMNJnB6JqgvYX+ZN8pmNAom4zSeL6l1jqv957ir/bRZgP1f3UruGIgUcsZlgCgCYFoBdRztr4SC0G/NhPtobNbaYPIaJHerO2I4wg3bDXf+SAjlA6BptYt+YcW64mU7FP/FAxU9193UCmLCBhbu+B00= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=A7dkHYzo; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="A7dkHYzo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3E10C4CEE7; Wed, 24 Sep 2025 13:36:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1758720987; bh=PP4GlelkN7bqBaOJj/FDhufoJKYKO3ceHzlIc1IQG+0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A7dkHYzoc6XWoJzulEj9Zqm2lIm/xcCXfkksBISOkIqPH62biFJApKmw+oxiq+wcs kK7GpQHOeyRZAcAn2Ld7fJf54/FZrxxXGfXEJ+8+1PnxbH4MLsvT7/HPEPDLOg3cbW n5ow+8L6xU8bQN7p3iVzYmYJAm+Nq8ixT+Z0lQc4L51uvwM+N6D8yb35xNhQGzfTCF 1jTUdfogbKV7HwYz8J3/o7RWIm0GYo8DJpEVPmcPdW0RFt6lb92moSyH9KeUZpp5GP YJGfLSqKwwFJf5Wsoe02SrZoSLrl2FuC2n8/sp4bABc0wrp4Blhj3WJIcWEdfMqx4v Gd0ZBrHYT8vxg== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1v1PfR-000000007Vm-1LPm; Wed, 24 Sep 2025 15:36:21 +0200 From: Johan Hovold To: Minghsiu Tsai , Houlong Wei , Andrew-CT Chen , Tiffany Lin , Yunfei Dong Cc: Mauro Carvalho Chehab , Matthias Brugger , AngeloGioacchino Del Regno , Hans Verkuil , linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 1/3] media: mediatek: vcodec: fix device leak on codec init Date: Wed, 24 Sep 2025 15:35:50 +0200 Message-ID: <20250924133552.28841-2-johan@kernel.org> X-Mailer: git-send-email 2.49.1 In-Reply-To: <20250924133552.28841-1-johan@kernel.org> References: <20250924133552.28841-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to drop the reference taken when looking up the VPU firmware device during codec init on probe failure (e.g. probe deferral) and on driver unbind. Fixes: 590577a4e525 ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Dec= oder Driver") Fixes: 4e855a6efa54 ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Enc= oder Driver") Cc: stable@vger.kernel.org # 4.8 Cc: Tiffany Lin Signed-off-by: Johan Hovold --- .../mediatek/vcodec/common/mtk_vcodec_fw_vpu.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_vp= u.c b/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_vpu.c index d7027d600208..9237738d7632 100644 --- a/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_vpu.c +++ b/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_vpu.c @@ -83,12 +83,20 @@ static const struct mtk_vcodec_fw_ops mtk_vcodec_vpu_ms= g =3D { .release =3D mtk_vcodec_vpu_release, }; =20 +static void mtk_vcodec_vpu_put_device(void *_dev) +{ + struct device *dev =3D _dev; + + put_device(dev); +} + struct mtk_vcodec_fw *mtk_vcodec_fw_vpu_init(void *priv, enum mtk_vcodec_f= w_use fw_use) { struct platform_device *fw_pdev; struct platform_device *plat_dev; struct mtk_vcodec_fw *fw; enum rst_id rst_id; + int ret; =20 if (fw_use =3D=3D ENCODER) { struct mtk_vcodec_enc_dev *enc_dev =3D priv; @@ -111,6 +119,11 @@ struct mtk_vcodec_fw *mtk_vcodec_fw_vpu_init(void *pri= v, enum mtk_vcodec_fw_use return ERR_PTR(-EINVAL); } =20 + ret =3D devm_add_action_or_reset(&plat_dev->dev, mtk_vcodec_vpu_put_devic= e, + &fw_pdev->dev); + if (ret) + return ERR_PTR(ret); + if (fw_use =3D=3D DECODER) vpu_wdt_reg_handler(fw_pdev, mtk_vcodec_vpu_reset_dec_handler, priv, rst= _id); else --=20 2.49.1 From nobody Thu Oct 2 00:46:02 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 2B51B143C69; Wed, 24 Sep 2025 13:36:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758720987; cv=none; b=rsv+vpRygpK499SlDms7ExlVmzKA0ZqXPNRZ3y+CMTL9a00F8KeCsOEtQBv2y+BDVfGZ+cmBG8KdA5nvnyi9jR00HFMhOFI+EtCb5/V6YyZ/iMV+8LbYvyENaBAMJmkGq+3YdyLf8lu+wn6f8mzu4SuVzFWDNYWSzhSSVZ8Cn/o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758720987; c=relaxed/simple; bh=OIe1RuE43WcLPQslx97SFCWinjb/HwQHW7IH+6ElOMg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Huqf0a3MkehHX2IqHL+tH8/QWle1yYnImXHDW6nsoG2PZRkeIeamBb6FwsSh0sas7af16PeezR364bafy/9m/LwE1obXEuHbnUnms8bgpG2V0E3JHtlDcsO4WxyPT14ffEXAvwZK8uQ1c3+ii1zpLX6nvmGstbJDq95LNACNfk4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TtIHGdIn; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TtIHGdIn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EAE7EC4CEF0; Wed, 24 Sep 2025 13:36:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1758720987; bh=OIe1RuE43WcLPQslx97SFCWinjb/HwQHW7IH+6ElOMg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TtIHGdInBRc3yBPYTTl8bd6Gw43MVEvPaahxJK4j6raLfkd6fZoluUh4cBWKxzNVp xLSTQxJe4q+gSiulkb09xEqcVgJS8RVTPhaJR7Z3PTYRJQ79AHbaLZqn3n1HbhEoX8 goXBkui6d/aQ+Plq7E/V42ox3e62lpM73FqVJVw27a5vdZYs2EFN2/72ZmMe4W8XkN Fv1LAuZeSiq0mhvH1ePZu4iMSH7f5K8MpRhVJCj1QJ3D3KKez9Lr8vshAm7/P4wxI9 iJZugM0vRtSkEfwZkIlNXmY4fAlMPm0JOLlywLHfVJ6q2jAVTw9o83dR9t9PfpSwdC xeqajp8hQygpA== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1v1PfR-000000007Vo-1fqE; Wed, 24 Sep 2025 15:36:21 +0200 From: Johan Hovold To: Minghsiu Tsai , Houlong Wei , Andrew-CT Chen , Tiffany Lin , Yunfei Dong Cc: Mauro Carvalho Chehab , Matthias Brugger , AngeloGioacchino Del Regno , Hans Verkuil , linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 2/3] media: mediatek: mdp: fix device leak on probe Date: Wed, 24 Sep 2025 15:35:51 +0200 Message-ID: <20250924133552.28841-3-johan@kernel.org> X-Mailer: git-send-email 2.49.1 In-Reply-To: <20250924133552.28841-1-johan@kernel.org> References: <20250924133552.28841-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to drop the reference taken when looking up the VPU firmware device during probe on probe failure (e.g. probe deferral) and on driver unbind. Fixes: c8eb2d7e8202 ("[media] media: Add Mediatek MDP Driver") Cc: stable@vger.kernel.org # 4.10 Cc: Minghsiu Tsai Signed-off-by: Johan Hovold --- drivers/media/platform/mediatek/mdp/mtk_mdp_core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/mediatek/mdp/mtk_mdp_core.c b/drivers/m= edia/platform/mediatek/mdp/mtk_mdp_core.c index 80fdc6ff57e0..5c7dcf4090f4 100644 --- a/drivers/media/platform/mediatek/mdp/mtk_mdp_core.c +++ b/drivers/media/platform/mediatek/mdp/mtk_mdp_core.c @@ -198,7 +198,7 @@ static int mtk_mdp_probe(struct platform_device *pdev) VPU_RST_MDP); if (ret) { dev_err(&pdev->dev, "Failed to register reset handler\n"); - goto err_m2m_register; + goto err_put_vpu; } =20 platform_set_drvdata(pdev, mdp); @@ -206,7 +206,7 @@ static int mtk_mdp_probe(struct platform_device *pdev) ret =3D vb2_dma_contig_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32)); if (ret) { dev_err(&pdev->dev, "Failed to set vb2 dma mag seg size\n"); - goto err_m2m_register; + goto err_put_vpu; } =20 pm_runtime_enable(dev); @@ -214,6 +214,8 @@ static int mtk_mdp_probe(struct platform_device *pdev) =20 return 0; =20 +err_put_vpu: + put_device(&mdp->vpu_dev->dev); err_m2m_register: v4l2_device_unregister(&mdp->v4l2_dev); =20 @@ -241,6 +243,7 @@ static void mtk_mdp_remove(struct platform_device *pdev) struct mtk_mdp_comp *comp, *comp_temp; =20 pm_runtime_disable(&pdev->dev); + put_device(&mdp->vpu_dev->dev); vb2_dma_contig_clear_max_seg_size(&pdev->dev); mtk_mdp_unregister_m2m_device(mdp); v4l2_device_unregister(&mdp->v4l2_dev); --=20 2.49.1 From nobody Thu Oct 2 00:46:02 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 3614922069E; Wed, 24 Sep 2025 13:36:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758720987; cv=none; b=Vo4QoZhPX3Pra5JgNkNUAekR9ywOT7JCtyZH0rJ0Tmx3ahwmooqwYI7vKr9u0kTperhoH4jF0Vdy2ORfDYDtFTWCC+rYP4p7AIyuairIzoXqYH1W4QkhVrLzcyqywvjaJe+UEbJthOIndCxLZeyGI9GhmZDqC98duhkGAuK1Y2k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758720987; c=relaxed/simple; bh=jve90eHMG69ekIGAvr0Md+ax6KbA5syj0SlM96b60/A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PCEtozymqAFRHF2qMft4ZHSrx0puKaapvupBHcRrvzUu9xuqKhzD2Ak0NrlTOcK3nSlL1c7QfwJTvfi6WmLvySRmdnBPgTI784oZjZorwqH8rEZdXuTp6DliNluBZjJJHzU7wmSkuBGoxtfVgQUlcnSikFliYqbb96EYQtLN0fY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mi+30k1D; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mi+30k1D" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B3F0C4CEF7; Wed, 24 Sep 2025 13:36:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1758720987; bh=jve90eHMG69ekIGAvr0Md+ax6KbA5syj0SlM96b60/A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mi+30k1DkGgqBZiZ2g9YAK8lQEYfznZP5K4oDTe9bcqcWdhPf/txdVEcddMKjrS/K xb6MCF9RClKfZ90EKAGsdjR/BHFj3jdHRlO5UL41+CmHl61yGSCzfL0rzxtLEzGvnM RNVjj2T+t12wJszTio2LOTkp2t+aTvSO2ay8guk3oryaS8X38Etmov1RCQsVp9AUr8 buJHdb3DVbZ1+EyjoR5bQ/t81eUJy7Z3+xxtWSKcNQ1gTmri6Lgbtz76IPb8/oasUr Zw1dmf+TMzfFxmP8bt025woGBs/vhhvKK9MebM+OybDu3PBpGE4eldnGYyXccW5/YX PE/Wr6THzyM/w== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1v1PfR-000000007Vq-25q0; Wed, 24 Sep 2025 15:36:21 +0200 From: Johan Hovold To: Minghsiu Tsai , Houlong Wei , Andrew-CT Chen , Tiffany Lin , Yunfei Dong Cc: Mauro Carvalho Chehab , Matthias Brugger , AngeloGioacchino Del Regno , Hans Verkuil , linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 3/3] media: mediatek: amend vpu_get_plat_device() documentation Date: Wed, 24 Sep 2025 15:35:52 +0200 Message-ID: <20250924133552.28841-4-johan@kernel.org> X-Mailer: git-send-email 2.49.1 In-Reply-To: <20250924133552.28841-1-johan@kernel.org> References: <20250924133552.28841-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a comment to the vpu_get_plat_device() documentation to make it clear that the VPU platform device is returned with an incremented reference count (which needs to be dropped after use). Signed-off-by: Johan Hovold --- drivers/media/platform/mediatek/vpu/mtk_vpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/mediatek/vpu/mtk_vpu.h b/drivers/media/= platform/mediatek/vpu/mtk_vpu.h index da05f3e74081..5808311d2b15 100644 --- a/drivers/media/platform/mediatek/vpu/mtk_vpu.h +++ b/drivers/media/platform/mediatek/vpu/mtk_vpu.h @@ -120,7 +120,7 @@ int vpu_ipi_send(struct platform_device *pdev, * device for using VPU API. * * Return: Return NULL if it is failed. - * otherwise it is VPU's platform device + * otherwise it is VPU's platform device with incremented reference count **/ struct platform_device *vpu_get_plat_device(struct platform_device *pdev); =20 --=20 2.49.1