Skip to contentSkip to conversation

drm/msm/devfreq: Fix OPP refcnt leak

PATCH Superseded Rob Clark 3 participants 4 messages Nov 4, 2021 – Nov 5, 2021

Subsystems (4)
DRM drivers Arm Qualcomm mailing list DRM driver for Qualcomm display hardware DRM driver for Qualcomm Adreno GPUs

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Rob Clark

author
#0 lore raw

PATCH 1/1 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/msm_gpu_devfreq.c +2 -2
index d32b729b4616..9bf8600b6eea 100644
@@ -20,8 +20,6 @@ static int msm_devfreq_target(struct device *dev, unsigned long *freq,
 	struct msm_gpu *gpu = dev_to_gpu(dev);
 	struct dev_pm_opp *opp;
 
-	opp = devfreq_recommended_opp(dev, freq, flags);
-
 	/*
 	 * If the GPU is idle, devfreq is not aware, so just ignore
 	 * it's requests

@@ -31,6 +29,8 @@ static int msm_devfreq_target(struct device *dev, unsigned long *freq,
 		return 0;
 	}
 
+	opp = devfreq_recommended_opp(dev, freq, flags);
+
 	if (IS_ERR(opp))
 		return PTR_ERR(opp);
Signature · 1 line
2.31.1
#2 lore raw
In reply to Rob Clark
Quoted 23 lines · Rob Clark

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 | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/msm_gpu_devfreq.c +0 -2
index d32b729b4616..9bf8600b6eea 100644
@@ -20,8 +20,6 @@ static int msm_devfreq_target(struct device *dev, unsigned long *freq,
  	struct msm_gpu *gpu = dev_to_gpu(dev);
  	struct dev_pm_opp *opp;
 
-	opp = devfreq_recommended_opp(dev, freq, flags);
-
  	/*
  	 * If the GPU is idle, devfreq is not aware, so just ignore
  	 * it's requests

drivers/gpu/drm/msm/msm_gpu_devfreq.c static int msm_devfreq_target(struct device *dev, unsigned long *freq, · line 36

Quoted 8 lines
drivers/gpu/drm/msm/msm_gpu_devfreq.c +2 -0
@@ -31,6 +29,8 @@ static int msm_devfreq_target(struct device *dev, unsigned long *freq,
  		return 0;
  	}
 
+	opp = devfreq_recommended_opp(dev, freq, flags);
+
  	if (IS_ERR(opp))
  		return PTR_ERR(opp);

Testing this here on the Lenovo Yoga C630, and I'm starting to see in my dmesg output

[   36.337061] devfreq 5000000.gpu: Couldn't update frequency transition information.
[   36.388122] devfreq 5000000.gpu: Couldn't update frequency transition information.
[   36.810941] wcd934x-codec wcd934x-codec.3.auto: Port Closed RX port 1, value 4
[   36.811914] wcd934x-codec wcd934x-codec.3.auto: Port Closed RX port 2, value 4
[  198.794946] devfreq 5000000.gpu: Couldn't update frequency transition information.
[  198.845698] devfreq 5000000.gpu: Couldn't update frequency transition information.
[  502.285421] devfreq 5000000.gpu: Couldn't update frequency transition information.
[  502.339427] devfreq 5000000.gpu: Couldn't update frequency transition information.
[  503.361469] devfreq 5000000.gpu: Couldn't update frequency transition information.
[  503.412757] devfreq 5000000.gpu: Couldn't update frequency transition information.
[  503.871480] devfreq 5000000.gpu: Couldn't update frequency transition information.
[  503.922712] devfreq 5000000.gpu: Couldn't update frequency transition information.
[  503.974474] devfreq 5000000.gpu: Couldn't update frequency transition information.
[  504.025501] devfreq 5000000.gpu: Couldn't update frequency transition information.
[  505.923563] devfreq 5000000.gpu: Couldn't update frequency transition information.
[  505.974513] devfreq 5000000.gpu: Couldn't update frequency transition information.
[  510.313052] usb 3-1.3: USB disconnect, device number 4
[  519.677148] usb 3-1.3: new high-speed USB device number 5 using xhci-hcd
[  519.793394] usb 3-1.3: New USB device found, idVendor=5986, idProduct=2115, bcdDevice=54.20
[  519.793441] usb 3-1.3: New USB device strings: Mfr=1, Product=2, SerialNumber=0
[  519.793472] usb 3-1.3: Product: Integrated Camera
[  519.793495] usb 3-1.3: Manufacturer: SunplusIT Inc
[  519.861020] usb 3-1.3: Found UVC 1.00 device Integrated Camera (5986:2115)
[  519.892879] input: Integrated Camera: Integrated C as /devices/platform/soc@0/a8f8800.usb/a800000.dwc3/xhci-hcd.1.auto/usb3/3-1/3-1.3/3-1.3:1.0/input/input27 [  520.283839] devfreq 5000000.gpu: Couldn't update frequency transition information.
[  520.335854] devfreq 5000000.gpu: Couldn't update frequency transition information.

Is this intended?

#3 lore raw

Hi,

Quoted 38 lines · Steev Klimaszewski
Quoted 23 lines · Rob Clark

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 | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/msm_gpu_devfreq.c +0 -2
index d32b729b4616..9bf8600b6eea 100644
@@ -20,8 +20,6 @@ static int msm_devfreq_target(struct device *dev, unsigned long *freq,
      struct msm_gpu *gpu = dev_to_gpu(dev);
      struct dev_pm_opp *opp;
 
-     opp = devfreq_recommended_opp(dev, freq, flags);
-
      /*
       * If the GPU is idle, devfreq is not aware, so just ignore
       * it's requests

drivers/gpu/drm/msm/msm_gpu_devfreq.c static int msm_devfreq_target(struct device *dev, unsigned long *freq, · line 36

Quoted 8 lines
drivers/gpu/drm/msm/msm_gpu_devfreq.c +2 -0
@@ -31,6 +29,8 @@ static int msm_devfreq_target(struct device *dev, unsigned long *freq,
              return 0;
      }
 
+     opp = devfreq_recommended_opp(dev, freq, flags);
+
      if (IS_ERR(opp))
              return PTR_ERR(opp);

Testing this here on the Lenovo Yoga C630, and I'm starting to see in my dmesg output

Quoted 4 lines
[   36.337061] devfreq 5000000.gpu: Couldn't update frequency transition
information.
[   36.388122] devfreq 5000000.gpu: Couldn't update frequency transition

information.

Ah, I think this makes sense. We're now storing a frequency which might not match an actual "opp" and I suppose that we must return it in some cases.

I guess a simple fix is to still call devfreq_recommended_opp() in the idle case but just call dev_pm_opp_put() to fix the leak.

-Doug