[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <694c3bd0-1588-ed28-d282-8e83fc6a06f5@arm.com>
Date: Mon, 13 Apr 2020 14:07:36 +0100
From: Steven Price <steven.price@....com>
To: Clément Péron <peron.clem@...il.com>,
Rob Herring <robh@...nel.org>,
Tomeu Vizoso <tomeu.vizoso@...labora.com>,
Alyssa Rosenzweig <alyssa.rosenzweig@...labora.com>,
Viresh Kumar <vireshk@...nel.org>, Nishanth Menon <nm@...com>,
Stephen Boyd <sboyd@...nel.org>
Cc: dri-devel@...ts.freedesktop.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/2] drm/panfrost: missing remove opp table in case of
failure
On 11/04/2020 21:06, Clément Péron wrote:
> In case of failure we need to remove OPP table.
>
> Use Linux classic error handling with goto usage.
>
> Signed-off-by: Clément Péron <peron.clem@...il.com>
Reviewed-by: Steven Price <steven.price@....com>
> ---
> drivers/gpu/drm/panfrost/panfrost_devfreq.c | 16 ++++++++++++----
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
> index 413987038fbf..62541f4edd81 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
> @@ -90,8 +90,11 @@ 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)) {
> + DRM_DEV_ERROR(dev, "Failed to set recommended OPP\n");
> + ret = PTR_ERR(opp);
> + goto err_opp;
> + }
>
> panfrost_devfreq_profile.initial_freq = cur_freq;
> dev_pm_opp_put(opp);
> @@ -100,8 +103,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_opp;
> }
> pfdev->devfreq.devfreq = devfreq;
>
> @@ -112,6 +115,11 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
> pfdev->devfreq.cooling = cooling;
>
> return 0;
> +
> +err_opp:
> + dev_pm_opp_of_remove_table(dev);
> +
> + return ret;
> }
>
> void panfrost_devfreq_fini(struct panfrost_device *pfdev)
>
Powered by blists - more mailing lists