2021-11-05 20:31:32

by Rob Clark

[permalink] [raw]
Subject: [PATCH v2] drm/msm/devfreq: Fix OPP refcnt leak

From: Rob Clark <[email protected]>

Reported-by: Douglas Anderson <[email protected]>
Fixes: 9bc95570175a ("drm/msm: Devfreq tuning")
Signed-off-by: Rob Clark <[email protected]>
---
drivers/gpu/drm/msm/msm_gpu_devfreq.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/msm/msm_gpu_devfreq.c b/drivers/gpu/drm/msm/msm_gpu_devfreq.c
index d32b729b4616..07f1169df89b 100644
--- a/drivers/gpu/drm/msm/msm_gpu_devfreq.c
+++ b/drivers/gpu/drm/msm/msm_gpu_devfreq.c
@@ -20,6 +20,10 @@ static int msm_devfreq_target(struct device *dev, unsigned long *freq,
struct msm_gpu *gpu = dev_to_gpu(dev);
struct dev_pm_opp *opp;

+ /*
+ * Note that devfreq_recommended_opp() can modify the freq
+ * to something that actually is in the opp table:
+ */
opp = devfreq_recommended_opp(dev, freq, flags);

/*
@@ -28,6 +32,7 @@ static int msm_devfreq_target(struct device *dev, unsigned long *freq,
*/
if (gpu->devfreq.idle_freq) {
gpu->devfreq.idle_freq = *freq;
+ dev_pm_opp_put(opp);
return 0;
}

--
2.31.1


2021-11-05 20:36:44

by Douglas Anderson

[permalink] [raw]
Subject: Re: [PATCH v2] drm/msm/devfreq: Fix OPP refcnt leak

Hi,

On Fri, Nov 5, 2021 at 1:15 PM Rob Clark <[email protected]> wrote:
>
> From: Rob Clark <[email protected]>
>
> Reported-by: Douglas Anderson <[email protected]>
> Fixes: 9bc95570175a ("drm/msm: Devfreq tuning")
> Signed-off-by: Rob Clark <[email protected]>
> ---
> drivers/gpu/drm/msm/msm_gpu_devfreq.c | 5 +++++
> 1 file changed, 5 insertions(+)

Reviewed-by: Douglas Anderson <[email protected]>

2021-11-06 00:39:04

by Steev Klimaszewski

[permalink] [raw]
Subject: Re: [PATCH v2] drm/msm/devfreq: Fix OPP refcnt leak


On 11/5/21 3:20 PM, Rob Clark wrote:
> From: Rob Clark <[email protected]>
>
> Reported-by: Douglas Anderson <[email protected]>
> Fixes: 9bc95570175a ("drm/msm: Devfreq tuning")
> Signed-off-by: Rob Clark <[email protected]>
> ---
> drivers/gpu/drm/msm/msm_gpu_devfreq.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/gpu/drm/msm/msm_gpu_devfreq.c b/drivers/gpu/drm/msm/msm_gpu_devfreq.c
> index d32b729b4616..07f1169df89b 100644
> --- a/drivers/gpu/drm/msm/msm_gpu_devfreq.c
> +++ b/drivers/gpu/drm/msm/msm_gpu_devfreq.c
> @@ -20,6 +20,10 @@ static int msm_devfreq_target(struct device *dev, unsigned long *freq,
> struct msm_gpu *gpu = dev_to_gpu(dev);
> struct dev_pm_opp *opp;
>
> + /*
> + * Note that devfreq_recommended_opp() can modify the freq
> + * to something that actually is in the opp table:
> + */
> opp = devfreq_recommended_opp(dev, freq, flags);
>
> /*
> @@ -28,6 +32,7 @@ static int msm_devfreq_target(struct device *dev, unsigned long *freq,
> */
> if (gpu->devfreq.idle_freq) {
> gpu->devfreq.idle_freq = *freq;
> + dev_pm_opp_put(opp);
> return 0;
> }
>

Tested on the Lenovo Yoga C630 and don't see the message from v1 :D

Tested-By: Steev Klimaszewski <[email protected]>

2021-11-06 01:18:18

by Akhil P Oommen

[permalink] [raw]
Subject: Re: [PATCH v2] drm/msm/devfreq: Fix OPP refcnt leak

On 11/6/2021 1:50 AM, Rob Clark wrote:
> From: Rob Clark <[email protected]>
>
> Reported-by: Douglas Anderson <[email protected]>
> Fixes: 9bc95570175a ("drm/msm: Devfreq tuning")
> Signed-off-by: Rob Clark <[email protected]>
> ---
> drivers/gpu/drm/msm/msm_gpu_devfreq.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/gpu/drm/msm/msm_gpu_devfreq.c b/drivers/gpu/drm/msm/msm_gpu_devfreq.c
> index d32b729b4616..07f1169df89b 100644
> --- a/drivers/gpu/drm/msm/msm_gpu_devfreq.c
> +++ b/drivers/gpu/drm/msm/msm_gpu_devfreq.c
> @@ -20,6 +20,10 @@ static int msm_devfreq_target(struct device *dev, unsigned long *freq,
> struct msm_gpu *gpu = dev_to_gpu(dev);
> struct dev_pm_opp *opp;
>
> + /*
> + * Note that devfreq_recommended_opp() can modify the freq
> + * to something that actually is in the opp table:
> + */
> opp = devfreq_recommended_opp(dev, freq, flags);
>
> /*
> @@ -28,6 +32,7 @@ static int msm_devfreq_target(struct device *dev, unsigned long *freq,
> */
> if (gpu->devfreq.idle_freq) {
> gpu->devfreq.idle_freq = *freq;
> + dev_pm_opp_put(opp);
> return 0;
> }
>
>

Reviewed-by: Akhil P Oommen <[email protected]>

-Akhil