FAILED: patch "[PATCH] drm/mediatek: Fix probe resource leaks" failed to apply to 6.6-stable tree
Subsystems (4)
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 07c7c640a8eb9e196f357d15d88a59602a947197
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026010554-disliking-demeanor-118d@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 07c7c640a8eb9e196f357d15d88a59602a947197 Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Tue, 23 Sep 2025 17:23:36 +0200
Subject: [PATCH] drm/mediatek: Fix probe resource leaks
Make sure to unmap and release the component iomap and clock on probe failure (e.g. probe deferral) and on driver unbind.
Note that unlike of_iomap(), devm_of_iomap() also checks whether the region is already mapped.
drivers/gpu/drm/mediatek/mtk_ddp_comp.c +16 -4
@@ -621,15 +621,20 @@ int mtk_find_possible_crtcs(struct drm_device *drm, struct device *dev)return ret; } -int mtk_ddp_comp_init (struct device_node *node,struct mtk_ddp_comp *comp, +static void mtk_ddp_comp_clk_put (void *_clk) +{ +struct clk *clk = _clk; + +clk_put (clk); +} + +int mtk_ddp_comp_init (struct device *dev,struct device_node *node,struct mtk_ddp_comp *comp,unsigned int comp_id) {struct platform_device *comp_pdev;enum mtk_ddp_comp_type type;struct mtk_ddp_comp_dev *priv; -#if IS_REACHABLE (CONFIG_MTK_CMDQ )int ret; -#endif if (comp_id >=DDP_COMPONENT_DRM_ID_MAX )return -EINVAL ;
@@ -670,11 +675,18 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp,if (!priv)return -ENOMEM ; - priv->regs =of_iomap (node,0 ); + priv->regs =devm_of_iomap (dev, node,0 ,NULL ); +if (IS_ERR (priv->regs)) +return PTR_ERR (priv->regs); + priv->clk =of_clk_get (node,0 );if (IS_ERR (priv->clk))return PTR_ERR (priv->clk); + ret =devm_add_action_or_reset (dev, mtk_ddp_comp_clk_put, priv->clk); +if (ret) +return ret; +#if IS_REACHABLE (CONFIG_MTK_CMDQ ) ret =cmdq_dev_get_client_reg (comp->dev, &priv->cmdq_reg,0 );if (ret)
drivers/gpu/drm/mediatek/mtk_ddp_comp.h +1 -1
@@ -350,7 +350,7 @@ static inline void mtk_ddp_comp_encoder_index_set(struct mtk_ddp_comp *comp)int mtk_ddp_comp_get_id (struct device_node *node,enum mtk_ddp_comp_type comp_type);int mtk_find_possible_crtcs (struct drm_device *drm,struct device *dev); -int mtk_ddp_comp_init (struct device_node *comp_node,struct mtk_ddp_comp *comp, +int mtk_ddp_comp_init (struct device *dev,struct device_node *comp_node,struct mtk_ddp_comp *comp,unsigned int comp_id);enum mtk_ddp_comp_type mtk_ddp_comp_get_type (unsigned int comp_id); void mtk_ddp_write(struct cmdq_pkt *cmdq_pkt, unsigned int value,
drivers/gpu/drm/mediatek/mtk_drm_drv.c +2 -2
@@ -1133,7 +1133,7 @@ static int mtk_drm_probe(struct platform_device *pdev) (void *)private->mmsys_dev, sizeof(*private->mmsys_dev)); private->ddp_comp[DDP_COMPONENT_DRM_OVL_ADAPTOR ].dev = &ovl_adaptor->dev; -mtk_ddp_comp_init (NULL , &private->ddp_comp[DDP_COMPONENT_DRM_OVL_ADAPTOR ], +mtk_ddp_comp_init (dev,NULL , &private->ddp_comp[DDP_COMPONENT_DRM_OVL_ADAPTOR ],DDP_COMPONENT_DRM_OVL_ADAPTOR );component_match_add (dev, &match, compare_dev, &ovl_adaptor->dev); }
@@ -1199,7 +1199,7 @@ static int mtk_drm_probe(struct platform_device *pdev) node); } - ret =mtk_ddp_comp_init (node, &private->ddp_comp[comp_id], comp_id); + ret =mtk_ddp_comp_init (dev, node, &private->ddp_comp[comp_id], comp_id);if (ret) {of_node_put (node); goto err_node;
Sasha Levin
maintainerPATCH 1/1 drm/mediatek: Fix probe resource leaks
From: Johan Hovold <[email protected]>
[ Upstream commit 07c7c640a8eb9e196f357d15d88a59602a947197 ]
Make sure to unmap and release the component iomap and clock on probe failure (e.g. probe deferral) and on driver unbind.
Note that unlike of_iomap(), devm_of_iomap() also checks whether the region is already mapped.
--- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 20 ++++++++++++++++---- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 ++-- 3 files changed, 19 insertions(+), 7 deletions(-)
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +16 -4
@@ -543,15 +543,20 @@ unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device *drm,return ret; } -int mtk_ddp_comp_init (struct device_node *node,struct mtk_ddp_comp *comp, +static void mtk_ddp_comp_clk_put (void *_clk) +{ +struct clk *clk = _clk; + +clk_put (clk); +} + +int mtk_ddp_comp_init (struct device *dev,struct device_node *node,struct mtk_ddp_comp *comp,unsigned int comp_id) {struct platform_device *comp_pdev;enum mtk_ddp_comp_type type;struct mtk_ddp_comp_dev *priv; -#if IS_REACHABLE (CONFIG_MTK_CMDQ )int ret; -#endif if (comp_id >=DDP_COMPONENT_DRM_ID_MAX )return -EINVAL ;
@@ -592,11 +597,18 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp,if (!priv)return -ENOMEM ; - priv->regs =of_iomap (node,0 ); + priv->regs =devm_of_iomap (dev, node,0 ,NULL ); +if (IS_ERR (priv->regs)) +return PTR_ERR (priv->regs); + priv->clk =of_clk_get (node,0 );if (IS_ERR (priv->clk))return PTR_ERR (priv->clk); + ret =devm_add_action_or_reset (dev, mtk_ddp_comp_clk_put, priv->clk); +if (ret) +return ret; +#if IS_REACHABLE (CONFIG_MTK_CMDQ ) ret =cmdq_dev_get_client_reg (comp->dev, &priv->cmdq_reg,0 );if (ret)
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h +1 -1
@@ -279,7 +279,7 @@ int mtk_ddp_comp_get_id(struct device_node *node, enum mtk_ddp_comp_type comp_type);unsigned int mtk_drm_find_possible_crtc_by_comp (struct drm_device *drm,struct device *dev); -int mtk_ddp_comp_init (struct device_node *comp_node,struct mtk_ddp_comp *comp, +int mtk_ddp_comp_init (struct device *dev,struct device_node *comp_node,struct mtk_ddp_comp *comp,unsigned int comp_id);enum mtk_ddp_comp_type mtk_ddp_comp_get_type (unsigned int comp_id); void mtk_ddp_write(struct cmdq_pkt *cmdq_pkt, unsigned int value,
drivers/gpu/drm/mediatek/mtk_drm_drv.c +2 -2
@@ -841,7 +841,7 @@ static int mtk_drm_probe(struct platform_device *pdev) (void *)private->mmsys_dev, sizeof(*private->mmsys_dev)); private->ddp_comp[DDP_COMPONENT_DRM_OVL_ADAPTOR ].dev = &ovl_adaptor->dev; -mtk_ddp_comp_init (NULL , &private->ddp_comp[DDP_COMPONENT_DRM_OVL_ADAPTOR ], +mtk_ddp_comp_init (dev,NULL , &private->ddp_comp[DDP_COMPONENT_DRM_OVL_ADAPTOR ],DDP_COMPONENT_DRM_OVL_ADAPTOR );component_match_add (dev, &match, compare_dev, &ovl_adaptor->dev); }
@@ -910,7 +910,7 @@ static int mtk_drm_probe(struct platform_device *pdev) node); } - ret =mtk_ddp_comp_init (node, &private->ddp_comp[comp_id], comp_id); + ret =mtk_ddp_comp_init (dev, node, &private->ddp_comp[comp_id], comp_id);if (ret) {of_node_put (node); goto err_node;
Signature · 1 line
2.51.0