From: "Adrián Larumbe" <adrian.larumbe@collabora.com>
To: "Boris Brezillon" <boris.brezillon@collabora.com>,
"Rob Herring" <robh@kernel.org>,
"Steven Price" <steven.price@arm.com>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"David Airlie" <airlied@gmail.com>,
"Simona Vetter" <simona@ffwll.ch>,
"Adrián Larumbe" <adrian.larumbe@collabora.com>,
"AngeloGioacchino Del Regno"
<angelogioacchino.delregno@collabora.com>,
"Liviu Dudau" <liviu.dudau@arm.com>,
"Clément Péron" <peron.clem@gmail.com>,
"Heiko Stuebner" <heiko@sntech.de>,
"Grant Likely" <grant.likely@linaro.org>
Cc: kernel@collabora.com, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/2] drm/panthor: Fix OPP refcnt leaks in devfreq initialisation
Date: Thu, 3 Oct 2024 14:30:29 +0100 [thread overview]
Message-ID: <20241003133037.3398144-2-adrian.larumbe@collabora.com> (raw)
In-Reply-To: <20241003133037.3398144-1-adrian.larumbe@collabora.com>
Make sure in case of errors between the first fetch of an OPP in
panthor_devfreq_init and its successive put, the error path decrements its
reference count to avoid OPP object leaks when removing the device.
Signed-off-by: Adrián Larumbe <adrian.larumbe@collabora.com>
Fixes: fac9b22df4b1 ("drm/panthor: Add the devfreq logical block")
---
drivers/gpu/drm/panthor/panthor_devfreq.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/panthor/panthor_devfreq.c b/drivers/gpu/drm/panthor/panthor_devfreq.c
index 9d0f891b9b53..ce0ac4563f65 100644
--- a/drivers/gpu/drm/panthor/panthor_devfreq.c
+++ b/drivers/gpu/drm/panthor/panthor_devfreq.c
@@ -197,7 +197,7 @@ int panthor_devfreq_init(struct panthor_device *ptdev)
if (ret && ret != -ENODEV) {
if (ret != -EPROBE_DEFER)
DRM_DEV_ERROR(dev, "Couldn't retrieve/enable sram supply\n");
- return ret;
+ goto opp_err;
}
/*
@@ -207,7 +207,7 @@ int panthor_devfreq_init(struct panthor_device *ptdev)
ret = dev_pm_opp_set_opp(dev, opp);
if (ret) {
DRM_DEV_ERROR(dev, "Couldn't set recommended OPP\n");
- return ret;
+ goto opp_err;
}
dev_pm_opp_put(opp);
@@ -242,6 +242,10 @@ int panthor_devfreq_init(struct panthor_device *ptdev)
DRM_DEV_INFO(dev, "Failed to register cooling device\n");
return 0;
+
+opp_err:
+ dev_pm_opp_put(opp);
+ return ret;
}
int panthor_devfreq_resume(struct panthor_device *ptdev)
--
2.46.2
next prev parent reply other threads:[~2024-10-03 13:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-03 13:30 [PATCH v2 1/2] drm/panfrost: Add missing OPP table refcnt decremental Adrián Larumbe
2024-10-03 13:30 ` Adrián Larumbe [this message]
2024-10-03 14:50 ` [PATCH v2 2/2] drm/panthor: Fix OPP refcnt leaks in devfreq initialisation Steven Price
2024-10-03 14:58 ` Boris Brezillon
2024-10-30 15:13 ` Boris Brezillon
2024-10-30 15:15 ` Boris Brezillon
2024-10-03 14:50 ` [PATCH v2 1/2] drm/panfrost: Add missing OPP table refcnt decremental Steven Price
2024-10-03 14:56 ` Boris Brezillon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241003133037.3398144-2-adrian.larumbe@collabora.com \
--to=adrian.larumbe@collabora.com \
--cc=airlied@gmail.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=boris.brezillon@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=grant.likely@linaro.org \
--cc=heiko@sntech.de \
--cc=kernel@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=liviu.dudau@arm.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=peron.clem@gmail.com \
--cc=robh@kernel.org \
--cc=simona@ffwll.ch \
--cc=steven.price@arm.com \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox