From: Steven Price <steven.price@arm.com>
To: "Clément Péron" <peron.clem@gmail.com>,
"Rob Herring" <robh@kernel.org>,
"Tomeu Vizoso" <tomeu.vizoso@collabora.com>,
"Alyssa Rosenzweig" <alyssa.rosenzweig@collabora.com>,
"Viresh Kumar" <vireshk@kernel.org>, "Nishanth Menon" <nm@ti.com>,
"Stephen Boyd" <sboyd@kernel.org>,
"Maxime Ripard" <mripard@kernel.org>,
"Chen-Yu Tsai" <wens@csie.org>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 06/15] drm/panfrost: properly handle error in probe
Date: Thu, 28 May 2020 14:22:47 +0100 [thread overview]
Message-ID: <6a5915af-680f-0e9f-1502-ccb4f8d3d199@arm.com> (raw)
In-Reply-To: <20200510165538.19720-7-peron.clem@gmail.com>
On 10/05/2020 17:55, Clément Péron wrote:
> Introduce a boolean to know if opp table has been added.
>
> With this, we can call panfrost_devfreq_fini() in case of error
> and release what has been initialised.
>
> Signed-off-by: Clément Péron <peron.clem@gmail.com>
LGTM:
Reviewed-by: Steven Price <steven.price@arm.com>
> ---
> drivers/gpu/drm/panfrost/panfrost_devfreq.c | 25 ++++++++++++++++-----
> drivers/gpu/drm/panfrost/panfrost_devfreq.h | 1 +
> 2 files changed, 20 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
> index 78753cfb59fb..d9007f44b772 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
> @@ -101,6 +101,7 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
> return 0;
> else if (ret)
> return ret;
> + pfdevfreq->opp_of_table_added = true;
>
> spin_lock_init(&pfdevfreq->lock);
>
> @@ -109,8 +110,10 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
> cur_freq = clk_get_rate(pfdev->clock);
>
> opp = devfreq_recommended_opp(dev, &cur_freq, 0);
> - if (IS_ERR(opp))
> - return PTR_ERR(opp);
> + if (IS_ERR(opp)) {
> + ret = PTR_ERR(opp);
> + goto err_fini;
> + }
>
> panfrost_devfreq_profile.initial_freq = cur_freq;
> dev_pm_opp_put(opp);
> @@ -119,8 +122,8 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
> DEVFREQ_GOV_SIMPLE_ONDEMAND, NULL);
> if (IS_ERR(devfreq)) {
> DRM_DEV_ERROR(dev, "Couldn't initialize GPU devfreq\n");
> - dev_pm_opp_of_remove_table(dev);
> - return PTR_ERR(devfreq);
> + ret = PTR_ERR(devfreq);
> + goto err_fini;
> }
> pfdevfreq->devfreq = devfreq;
>
> @@ -131,15 +134,25 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
> pfdevfreq->cooling = cooling;
>
> return 0;
> +
> +err_fini:
> + panfrost_devfreq_fini(pfdev);
> + return ret;
> }
>
> void panfrost_devfreq_fini(struct panfrost_device *pfdev)
> {
> struct panfrost_devfreq *pfdevfreq = &pfdev->pfdevfreq;
>
> - if (pfdevfreq->cooling)
> + if (pfdevfreq->cooling) {
> devfreq_cooling_unregister(pfdevfreq->cooling);
> - dev_pm_opp_of_remove_table(&pfdev->pdev->dev);
> + pfdevfreq->cooling = NULL;
> + }
> +
> + if (pfdevfreq->opp_of_table_added) {
> + dev_pm_opp_of_remove_table(&pfdev->pdev->dev);
> + pfdevfreq->opp_of_table_added = false;
> + }
> }
>
> void panfrost_devfreq_resume(struct panfrost_device *pfdev)
> diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.h b/drivers/gpu/drm/panfrost/panfrost_devfreq.h
> index e6629900a618..add203cb00c2 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.h
> +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.h
> @@ -15,6 +15,7 @@ struct panfrost_device;
> struct panfrost_devfreq {
> struct devfreq *devfreq;
> struct thermal_cooling_device *cooling;
> + bool opp_of_table_added;
>
> ktime_t busy_time;
> ktime_t idle_time;
>
next prev parent reply other threads:[~2020-05-28 13:23 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-10 16:55 [PATCH 00/15][RFC] Add regulator devfreq support to Panfrost Clément Péron
2020-05-10 16:55 ` [PATCH 01/15] drm/panfrost: avoid static declaration Clément Péron
2020-05-28 13:22 ` Steven Price
2020-05-10 16:55 ` [PATCH 02/15] drm/panfrost: clean headers in devfreq Clément Péron
2020-05-28 13:22 ` Steven Price
2020-05-10 16:55 ` [PATCH 03/15] drm/panfrost: don't use pfdevfreq.busy_count to know if hw is idle Clément Péron
2020-05-28 13:22 ` Steven Price
2020-05-10 16:55 ` [PATCH 04/15] drm/panfrost: introduce panfrost_devfreq struct Clément Péron
2020-05-28 13:22 ` Steven Price
2020-05-10 16:55 ` [PATCH 05/15] drm/panfrost: use spinlock instead of atomic Clément Péron
2020-05-28 13:22 ` Steven Price
2020-05-29 12:20 ` Robin Murphy
2020-05-29 12:35 ` Clément Péron
2020-05-29 12:47 ` Steven Price
2020-05-10 16:55 ` [PATCH 06/15] drm/panfrost: properly handle error in probe Clément Péron
2020-05-28 13:22 ` Steven Price [this message]
2020-05-10 16:55 ` [PATCH 07/15] drm/panfrost: use device_property_present to check for OPP Clément Péron
2020-05-28 13:22 ` Steven Price
2020-05-29 12:45 ` Clément Péron
2020-05-10 16:55 ` [PATCH 08/15] drm/panfrost: move devfreq_init()/fini() in device Clément Péron
2020-05-28 13:22 ` Steven Price
2020-05-29 12:38 ` Clément Péron
2020-06-08 11:55 ` Tomeu Vizoso
2020-05-10 16:55 ` [PATCH 09/15] drm/panfrost: dynamically alloc regulators Clément Péron
2020-05-28 13:22 ` Steven Price
2020-05-10 16:55 ` [PATCH 10/15] drm/panfrost: add regulators to devfreq Clément Péron
2020-05-28 13:23 ` Steven Price
2020-05-29 12:37 ` Clément Péron
2020-05-10 16:55 ` [PATCH 11/15] drm/panfrost: set devfreq clock name Clément Péron
2020-05-28 13:23 ` Steven Price
2020-05-29 12:35 ` Clément Péron
2020-05-10 16:55 ` [PATCH 12/15] arm64: defconfig: Enable devfreq cooling device Clément Péron
2020-05-10 16:55 ` [PATCH 13/15] arm64: dts: allwinner: h6: Add cooling map for GPU Clément Péron
2020-05-10 16:55 ` [PATCH 14/15] [DO NOT MERGE] arm64: dts: allwinner: h6: Add GPU OPP table Clément Péron
2020-05-10 16:55 ` [PATCH 15/15] [DO NOT MERGE] arm64: dts: allwinner: force GPU regulator to be always Clément Péron
2020-05-11 5:43 ` [PATCH 00/15][RFC] Add regulator devfreq support to Panfrost Tomeu Vizoso
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=6a5915af-680f-0e9f-1502-ccb4f8d3d199@arm.com \
--to=steven.price@arm.com \
--cc=alyssa.rosenzweig@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mripard@kernel.org \
--cc=nm@ti.com \
--cc=peron.clem@gmail.com \
--cc=robh@kernel.org \
--cc=sboyd@kernel.org \
--cc=tomeu.vizoso@collabora.com \
--cc=vireshk@kernel.org \
--cc=wens@csie.org \
/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;
as well as URLs for NNTP newsgroup(s).