| Message ID | 1588339863-1322-1-git-send-email-kalyan_t@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/msm/dpu: ensure device suspend happens during PM sleep | expand |
Hi, On Fri, May 1, 2020 at 6:31 AM Kalyan Thota <kalyan_t@codeaurora.org> wrote: > > "The PM core always increments the runtime usage counter > before calling the ->suspend() callback and decrements it > after calling the ->resume() callback" > > DPU and DSI are managed as runtime devices. When > suspend is triggered, PM core adds a refcount on all the > devices and calls device suspend, since usage count is > already incremented, runtime suspend was not getting called > and it kept the clocks on which resulted in target not > entering into XO shutdown. > > Add changes to force suspend on runtime devices during pm sleep. > > Changes in v1: > - Remove unnecessary checks in the function > _dpu_kms_disable_dpu (Rob Clark). > > Changes in v2: > - Avoid using suspend_late to reset the usagecount > as suspend_late might not be called during suspend > call failures (Doug). > > Changes in v3: > - Use force suspend instead of managing device usage_count > via runtime put and get API's to trigger callbacks (Doug). > > Changes in v4: > - Check the return values of pm_runtime_force_suspend and > pm_runtime_force_resume API's and pass appropriately (Doug). > > Changes in v5: Can you please put the version number properly in your subject? It's really hard to tell one version of your patch from another. > - With v4 patch, test cycle has uncovered issues in device resume. > > On bubs: cmd tx failures were seen as SW is sending panel off > commands when the dsi resources are turned off. > > Upon suspend, DRM driver will issue a NULL composition to the > dpu, followed by turning off all the HW blocks. > > v5 changes will serialize the NULL commit and resource unwinding > by handling them under PM prepare and PM complete phases there by > ensuring that clks are on when panel off commands are being > processed. I'm still most definitely not an expert in how all the DRM pieces all hook up together, but the solution you have in this patch seems wrong to me. As far as I can tell the "prepare" state isn't supposed to be actually doing the suspend work and here that's exactly what you're doing. I think you should find a different solution to ensure ordering is correct. -Doug
On 2020-05-14 21:47, Doug Anderson wrote: > Hi, > > On Fri, May 1, 2020 at 6:31 AM Kalyan Thota <kalyan_t@codeaurora.org> > wrote: >> >> "The PM core always increments the runtime usage counter >> before calling the ->suspend() callback and decrements it >> after calling the ->resume() callback" >> >> DPU and DSI are managed as runtime devices. When >> suspend is triggered, PM core adds a refcount on all the >> devices and calls device suspend, since usage count is >> already incremented, runtime suspend was not getting called >> and it kept the clocks on which resulted in target not >> entering into XO shutdown. >> >> Add changes to force suspend on runtime devices during pm sleep. >> >> Changes in v1: >> - Remove unnecessary checks in the function >> _dpu_kms_disable_dpu (Rob Clark). >> >> Changes in v2: >> - Avoid using suspend_late to reset the usagecount >> as suspend_late might not be called during suspend >> call failures (Doug). >> >> Changes in v3: >> - Use force suspend instead of managing device usage_count >> via runtime put and get API's to trigger callbacks (Doug). >> >> Changes in v4: >> - Check the return values of pm_runtime_force_suspend and >> pm_runtime_force_resume API's and pass appropriately (Doug). >> >> Changes in v5: > > Can you please put the version number properly in your subject? It's > really hard to tell one version of your patch from another. > > >> - With v4 patch, test cycle has uncovered issues in device resume. >> >> On bubs: cmd tx failures were seen as SW is sending panel off >> commands when the dsi resources are turned off. >> >> Upon suspend, DRM driver will issue a NULL composition to the >> dpu, followed by turning off all the HW blocks. >> >> v5 changes will serialize the NULL commit and resource unwinding >> by handling them under PM prepare and PM complete phases there by >> ensuring that clks are on when panel off commands are being >> processed. > > I'm still most definitely not an expert in how all the DRM pieces all > hook up together, but the solution you have in this patch seems wrong > to me. As far as I can tell the "prepare" state isn't supposed to be > actually doing the suspend work and here that's exactly what you're > doing. I think you should find a different solution to ensure > ordering is correct. > > -Doug > Hi, Prepare and Complete are callbacks defined as part of Sleep and Resume sequence Entering PM SUSPEND the phases are : prepare --> suspend --> suspend_late --> suspend_noirq. While leaving PM SUSPEND the phases are: resume_noirq --> resume_early --> resume --> complete. The reason to push drm suspend handling to PM prepare phase is that parent here will trigger a modeset to turn off the timing and subsequently the panel. the child devices should not turn of their clocks before parent unwinds the composition. Hence they are serialized as per the sequence mentioned above. A similar approach is taken by other driver that use drm framework. In this driver, the device registers for prepare and complete callbacks to handle drm_suspend and drm_resume. https://gitlab.freedesktop.org/drm/msm/-/blob/msm-next/drivers/gpu/drm/exynos/exynos_drm_drv.c#L163 Kalyan
Hi, On Fri, May 15, 2020 at 5:06 AM <kalyan_t@codeaurora.org> wrote: > > On 2020-05-14 21:47, Doug Anderson wrote: > > Hi, > > > > On Fri, May 1, 2020 at 6:31 AM Kalyan Thota <kalyan_t@codeaurora.org> > > wrote: > >> > >> "The PM core always increments the runtime usage counter > >> before calling the ->suspend() callback and decrements it > >> after calling the ->resume() callback" > >> > >> DPU and DSI are managed as runtime devices. When > >> suspend is triggered, PM core adds a refcount on all the > >> devices and calls device suspend, since usage count is > >> already incremented, runtime suspend was not getting called > >> and it kept the clocks on which resulted in target not > >> entering into XO shutdown. > >> > >> Add changes to force suspend on runtime devices during pm sleep. > >> > >> Changes in v1: > >> - Remove unnecessary checks in the function > >> _dpu_kms_disable_dpu (Rob Clark). > >> > >> Changes in v2: > >> - Avoid using suspend_late to reset the usagecount > >> as suspend_late might not be called during suspend > >> call failures (Doug). > >> > >> Changes in v3: > >> - Use force suspend instead of managing device usage_count > >> via runtime put and get API's to trigger callbacks (Doug). > >> > >> Changes in v4: > >> - Check the return values of pm_runtime_force_suspend and > >> pm_runtime_force_resume API's and pass appropriately (Doug). > >> > >> Changes in v5: > > > > Can you please put the version number properly in your subject? It's > > really hard to tell one version of your patch from another. > > > > > >> - With v4 patch, test cycle has uncovered issues in device resume. > >> > >> On bubs: cmd tx failures were seen as SW is sending panel off > >> commands when the dsi resources are turned off. > >> > >> Upon suspend, DRM driver will issue a NULL composition to the > >> dpu, followed by turning off all the HW blocks. > >> > >> v5 changes will serialize the NULL commit and resource unwinding > >> by handling them under PM prepare and PM complete phases there by > >> ensuring that clks are on when panel off commands are being > >> processed. > > > > I'm still most definitely not an expert in how all the DRM pieces all > > hook up together, but the solution you have in this patch seems wrong > > to me. As far as I can tell the "prepare" state isn't supposed to be > > actually doing the suspend work and here that's exactly what you're > > doing. I think you should find a different solution to ensure > > ordering is correct. > > > > -Doug > > > > Hi, Quite honestly I'm probably not the right person to be reviewing this code. I mostly just noticed one of your early patches and it looked strange to me. Hopefully someone with actual experience in how all the DRM components work together can actually review and see if this makes sense. Maybe Sean would know better? That being said, let me at least look at what you're saying... > Prepare and Complete are callbacks defined as part of Sleep and Resume > sequence > > Entering PM SUSPEND the phases are : prepare --> suspend --> > suspend_late --> suspend_noirq. > While leaving PM SUSPEND the phases are: resume_noirq --> resume_early > --> resume --> complete. Sure, it's part of the sequence. It's also documented in pm.h as: * The principal role of this callback is to prevent new children of * the device from being registered after it has returned (the driver's * subsystem and generally the rest of the kernel is supposed to prevent * new calls to the probe method from being made too once @prepare() has * succeeded). It does not feel like that matches your usage of this call. > The reason to push drm suspend handling to PM prepare phase is that > parent here will trigger a modeset to turn off the timing and > subsequently the panel. > the child devices should not turn of their clocks before parent unwinds > the composition. Hence they are serialized as per the sequence mentioned > above. So the general model in Linux is that children suspend before their parents, right? So you're saying that, in this case, the parent needs to act on the child before the child suspends. Is that correct? Rather than hijacking the prepare/complete, I'd be at least slightly inclined to move the other driver to turn off its clocks in suspend_late and to turn them back on in resume_early? That seems to be what was done in "analogix_dp-rockchip.c" to solve a similar problem. > A similar approach is taken by other driver that use drm framework. In > this driver, the device registers for prepare and complete callbacks to > handle drm_suspend and drm_resume. > https://gitlab.freedesktop.org/drm/msm/-/blob/msm-next/drivers/gpu/drm/exynos/exynos_drm_drv.c#L163 OK, if there is another driver in DRM then I guess I won't object too strongly. Note that when searching for other drivers I noticed this bit in todo.rst: * Most drivers (except i915 and nouveau) that use * drm_atomic_helper_suspend/resume() can probably be converted to use * drm_mode_config_helper_suspend/resume(). Also there's still open-coded version * of the atomic suspend/resume code in older atomic modeset drivers. Does anything get fixed if you do that? It seems like it'd cleanup your code a bit so maybe worth doing anyway... --- I guess the last question I'd want resolved is why you have this asymmetry: SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, msm_pm_resume) Why couldn't you use pm_runtime_force_resume()? -Doug
Hi, On Fri, May 15, 2020 at 9:37 AM Doug Anderson <dianders@chromium.org> wrote: > > Hi, > > On Fri, May 15, 2020 at 5:06 AM <kalyan_t@codeaurora.org> wrote: > > > > On 2020-05-14 21:47, Doug Anderson wrote: > > > Hi, > > > > > > On Fri, May 1, 2020 at 6:31 AM Kalyan Thota <kalyan_t@codeaurora.org> > > > wrote: > > >> > > >> "The PM core always increments the runtime usage counter > > >> before calling the ->suspend() callback and decrements it > > >> after calling the ->resume() callback" > > >> > > >> DPU and DSI are managed as runtime devices. When > > >> suspend is triggered, PM core adds a refcount on all the > > >> devices and calls device suspend, since usage count is > > >> already incremented, runtime suspend was not getting called > > >> and it kept the clocks on which resulted in target not > > >> entering into XO shutdown. > > >> > > >> Add changes to force suspend on runtime devices during pm sleep. > > >> > > >> Changes in v1: > > >> - Remove unnecessary checks in the function > > >> _dpu_kms_disable_dpu (Rob Clark). > > >> > > >> Changes in v2: > > >> - Avoid using suspend_late to reset the usagecount > > >> as suspend_late might not be called during suspend > > >> call failures (Doug). > > >> > > >> Changes in v3: > > >> - Use force suspend instead of managing device usage_count > > >> via runtime put and get API's to trigger callbacks (Doug). > > >> > > >> Changes in v4: > > >> - Check the return values of pm_runtime_force_suspend and > > >> pm_runtime_force_resume API's and pass appropriately (Doug). > > >> > > >> Changes in v5: > > > > > > Can you please put the version number properly in your subject? It's > > > really hard to tell one version of your patch from another. > > > > > > > > >> - With v4 patch, test cycle has uncovered issues in device resume. > > >> > > >> On bubs: cmd tx failures were seen as SW is sending panel off > > >> commands when the dsi resources are turned off. > > >> > > >> Upon suspend, DRM driver will issue a NULL composition to the > > >> dpu, followed by turning off all the HW blocks. > > >> > > >> v5 changes will serialize the NULL commit and resource unwinding > > >> by handling them under PM prepare and PM complete phases there by > > >> ensuring that clks are on when panel off commands are being > > >> processed. > > > > > > I'm still most definitely not an expert in how all the DRM pieces all > > > hook up together, but the solution you have in this patch seems wrong > > > to me. As far as I can tell the "prepare" state isn't supposed to be > > > actually doing the suspend work and here that's exactly what you're > > > doing. I think you should find a different solution to ensure > > > ordering is correct. > > > > > > -Doug > > > > > > > Hi, > > Quite honestly I'm probably not the right person to be reviewing this > code. I mostly just noticed one of your early patches and it looked > strange to me. Hopefully someone with actual experience in how all > the DRM components work together can actually review and see if this > makes sense. Maybe Sean would know better? > > That being said, let me at least look at what you're saying... > > > > Prepare and Complete are callbacks defined as part of Sleep and Resume > > sequence > > > > Entering PM SUSPEND the phases are : prepare --> suspend --> > > suspend_late --> suspend_noirq. > > While leaving PM SUSPEND the phases are: resume_noirq --> resume_early > > --> resume --> complete. > > Sure, it's part of the sequence. It's also documented in pm.h as: > > * The principal role of this callback is to prevent new children of > * the device from being registered after it has returned (the driver's > * subsystem and generally the rest of the kernel is supposed to prevent > * new calls to the probe method from being made too once @prepare() has > * succeeded). > > It does not feel like that matches your usage of this call. > > > > The reason to push drm suspend handling to PM prepare phase is that > > parent here will trigger a modeset to turn off the timing and > > subsequently the panel. > > the child devices should not turn of their clocks before parent unwinds > > the composition. Hence they are serialized as per the sequence mentioned > > above. > > So the general model in Linux is that children suspend before their > parents, right? So you're saying that, in this case, the parent needs > to act on the child before the child suspends. Is that correct? > > Rather than hijacking the prepare/complete, I'd be at least slightly > inclined to move the other driver to turn off its clocks in > suspend_late and to turn them back on in resume_early? That seems to > be what was done in "analogix_dp-rockchip.c" to solve a similar > problem. > > > > A similar approach is taken by other driver that use drm framework. In > > this driver, the device registers for prepare and complete callbacks to > > handle drm_suspend and drm_resume. > > https://gitlab.freedesktop.org/drm/msm/-/blob/msm-next/drivers/gpu/drm/exynos/exynos_drm_drv.c#L163 > > OK, if there is another driver in DRM then I guess I won't object too > strongly. Note that when searching for other drivers I noticed this > bit in todo.rst: > > * Most drivers (except i915 and nouveau) that use > * drm_atomic_helper_suspend/resume() can probably be converted to use > * drm_mode_config_helper_suspend/resume(). Also there's still open-coded version > * of the atomic suspend/resume code in older atomic modeset drivers. > > Does anything get fixed if you do that? It seems like it'd cleanup > your code a bit so maybe worth doing anyway... > > --- > > I guess the last question I'd want resolved is why you have this asymmetry: > > SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, msm_pm_resume) > > Why couldn't you use pm_runtime_force_resume()? I'm curious if you had answers to any of the questions I posed in my review. -Doug
On 2020-05-28 03:41, Doug Anderson wrote: > Hi, > > On Fri, May 15, 2020 at 9:37 AM Doug Anderson <dianders@chromium.org> > wrote: >> >> Hi, >> >> On Fri, May 15, 2020 at 5:06 AM <kalyan_t@codeaurora.org> wrote: >> > >> > On 2020-05-14 21:47, Doug Anderson wrote: >> > > Hi, >> > > >> > > On Fri, May 1, 2020 at 6:31 AM Kalyan Thota <kalyan_t@codeaurora.org> >> > > wrote: >> > >> >> > >> "The PM core always increments the runtime usage counter >> > >> before calling the ->suspend() callback and decrements it >> > >> after calling the ->resume() callback" >> > >> >> > >> DPU and DSI are managed as runtime devices. When >> > >> suspend is triggered, PM core adds a refcount on all the >> > >> devices and calls device suspend, since usage count is >> > >> already incremented, runtime suspend was not getting called >> > >> and it kept the clocks on which resulted in target not >> > >> entering into XO shutdown. >> > >> >> > >> Add changes to force suspend on runtime devices during pm sleep. >> > >> >> > >> Changes in v1: >> > >> - Remove unnecessary checks in the function >> > >> _dpu_kms_disable_dpu (Rob Clark). >> > >> >> > >> Changes in v2: >> > >> - Avoid using suspend_late to reset the usagecount >> > >> as suspend_late might not be called during suspend >> > >> call failures (Doug). >> > >> >> > >> Changes in v3: >> > >> - Use force suspend instead of managing device usage_count >> > >> via runtime put and get API's to trigger callbacks (Doug). >> > >> >> > >> Changes in v4: >> > >> - Check the return values of pm_runtime_force_suspend and >> > >> pm_runtime_force_resume API's and pass appropriately (Doug). >> > >> >> > >> Changes in v5: >> > > >> > > Can you please put the version number properly in your subject? It's >> > > really hard to tell one version of your patch from another. >> > > >> > > >> > >> - With v4 patch, test cycle has uncovered issues in device resume. >> > >> >> > >> On bubs: cmd tx failures were seen as SW is sending panel off >> > >> commands when the dsi resources are turned off. >> > >> >> > >> Upon suspend, DRM driver will issue a NULL composition to the >> > >> dpu, followed by turning off all the HW blocks. >> > >> >> > >> v5 changes will serialize the NULL commit and resource unwinding >> > >> by handling them under PM prepare and PM complete phases there by >> > >> ensuring that clks are on when panel off commands are being >> > >> processed. >> > > >> > > I'm still most definitely not an expert in how all the DRM pieces all >> > > hook up together, but the solution you have in this patch seems wrong >> > > to me. As far as I can tell the "prepare" state isn't supposed to be >> > > actually doing the suspend work and here that's exactly what you're >> > > doing. I think you should find a different solution to ensure >> > > ordering is correct. >> > > >> > > -Doug >> > > >> > >> > Hi, >> >> Quite honestly I'm probably not the right person to be reviewing this >> code. I mostly just noticed one of your early patches and it looked >> strange to me. Hopefully someone with actual experience in how all >> the DRM components work together can actually review and see if this >> makes sense. Maybe Sean would know better? >> >> That being said, let me at least look at what you're saying... >> >> >> > Prepare and Complete are callbacks defined as part of Sleep and Resume >> > sequence >> > >> > Entering PM SUSPEND the phases are : prepare --> suspend --> >> > suspend_late --> suspend_noirq. >> > While leaving PM SUSPEND the phases are: resume_noirq --> resume_early >> > --> resume --> complete. >> >> Sure, it's part of the sequence. It's also documented in pm.h as: >> >> * The principal role of this callback is to prevent new children of >> * the device from being registered after it has returned (the >> driver's >> * subsystem and generally the rest of the kernel is supposed to >> prevent >> * new calls to the probe method from being made too once @prepare() >> has >> * succeeded). >> >> It does not feel like that matches your usage of this call. >> >> >> > The reason to push drm suspend handling to PM prepare phase is that >> > parent here will trigger a modeset to turn off the timing and >> > subsequently the panel. >> > the child devices should not turn of their clocks before parent unwinds >> > the composition. Hence they are serialized as per the sequence mentioned >> > above. >> >> So the general model in Linux is that children suspend before their >> parents, right? So you're saying that, in this case, the parent needs >> to act on the child before the child suspends. Is that correct? >> >> Rather than hijacking the prepare/complete, I'd be at least slightly >> inclined to move the other driver to turn off its clocks in >> suspend_late and to turn them back on in resume_early? That seems to >> be what was done in "analogix_dp-rockchip.c" to solve a similar >> problem. >> >> >> > A similar approach is taken by other driver that use drm framework. In >> > this driver, the device registers for prepare and complete callbacks to >> > handle drm_suspend and drm_resume. >> > https://gitlab.freedesktop.org/drm/msm/-/blob/msm-next/drivers/gpu/drm/exynos/exynos_drm_drv.c#L163 >> >> OK, if there is another driver in DRM then I guess I won't object too >> strongly. Note that when searching for other drivers I noticed this >> bit in todo.rst: >> >> * Most drivers (except i915 and nouveau) that use >> * drm_atomic_helper_suspend/resume() can probably be converted to use >> * drm_mode_config_helper_suspend/resume(). Also there's still >> open-coded version >> * of the atomic suspend/resume code in older atomic modeset drivers. >> >> Does anything get fixed if you do that? It seems like it'd cleanup >> your code a bit so maybe worth doing anyway... >> >> --- >> >> I guess the last question I'd want resolved is why you have this >> asymmetry: >> >> SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, msm_pm_resume) >> >> Why couldn't you use pm_runtime_force_resume()? > > I'm curious if you had answers to any of the questions I posed in my > review. > > -Doug 1) i'll update the patch to use "drm_mode_config_helper_suspend/resume". This will help in additional cleanup such as enabling FBDEV emulation in the build. 2) For the asymmetry part, pm_runtime_force_resume() was not waking up the device forcefully if the usage count is 1. PM core thinks that if usage count is 1 then device can be runtime resumed after suspend/resume sequence is complete. This is true for all the child nodes and the parent node. Hence to overcome that i used pm_runtime_resume on parent. I have explored a bit on how to handle this cleanly, found an old thread discussing on the similar problem (https://lists.gt.net/linux/kernel/1556562 post no#4 Alan Stern ) the suggestion was to use runtime API's directly in PM Suspend/Resume. I have found few example implementations on similar lines. https://gitlab.freedesktop.org/drm/msm/-/blob/msm-next/drivers/media/platform/mtk-mdp/mtk_mdp_core.c#L279 https://gitlab.freedesktop.org/drm/msm/-/blob/msm-next/drivers/media/i2c/ak7375.c#L273 https://gitlab.freedesktop.org/drm/msm/-/blob/msm-next/drivers/gnss/sirf.c#L377 I have changed the implementation on those lines in v6. Summary of the flow now: PM Sleep --> pm_prepare for parent ( Disable all the DRM CRTCs) --> Suspend for child1, child2 ( turn off child clocks )--> Suspend for parent (turn off parent clocks ) PM Wakeup --> Resume for child1, child2 ( force resume is inactive due to usage count 1, but the call is needed to undo the force suspend things ) --> Resume for Parent (turn on parent clocks ) --> PM_complete for Parent.( By the time we reach here, PM core will remove the usage count for all the children and they are ready for runtime resume. Parent enables CRTCs which will runtime resume all the child clocks) Let me know your views on it. --Kalyan > _______________________________________________ > Freedreno mailing list > Freedreno@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/freedreno
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index ce19f1d..b886d9d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -1123,6 +1123,8 @@ static int __maybe_unused dpu_runtime_resume(struct device *dev) static const struct dev_pm_ops dpu_pm_ops = { SET_RUNTIME_PM_OPS(dpu_runtime_suspend, dpu_runtime_resume, NULL) + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, + pm_runtime_force_resume) }; static const struct of_device_id dpu_dt_match[] = { diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 55ea4bc2..62704885 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -161,6 +161,8 @@ static int dsi_dev_remove(struct platform_device *pdev) static const struct dev_pm_ops dsi_pm_ops = { SET_RUNTIME_PM_OPS(msm_dsi_runtime_suspend, msm_dsi_runtime_resume, NULL) + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, + pm_runtime_force_resume) }; static struct platform_driver dsi_driver = { diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 7d985f8..47d492b 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -1036,7 +1036,7 @@ static int msm_ioctl_submitqueue_close(struct drm_device *dev, void *data, }; #ifdef CONFIG_PM_SLEEP -static int msm_pm_suspend(struct device *dev) +static int msm_pm_prepare(struct device *dev) { struct drm_device *ddev = dev_get_drvdata(dev); struct msm_drm_private *priv = ddev->dev_private; @@ -1054,18 +1054,28 @@ static int msm_pm_suspend(struct device *dev) return 0; } -static int msm_pm_resume(struct device *dev) +static void msm_pm_complete(struct device *dev) { struct drm_device *ddev = dev_get_drvdata(dev); struct msm_drm_private *priv = ddev->dev_private; int ret; if (WARN_ON(!priv->pm_state)) - return -ENOENT; + return; ret = drm_atomic_helper_resume(ddev, priv->pm_state); if (!ret) priv->pm_state = NULL; +} + +static int msm_pm_resume(struct device *dev) +{ + int ret; + + /* unwind runtime_disable called by force suspend */ + pm_runtime_enable(dev); + + ret = pm_runtime_resume(dev); return ret; } @@ -1102,8 +1112,10 @@ static int msm_runtime_resume(struct device *dev) #endif static const struct dev_pm_ops msm_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(msm_pm_suspend, msm_pm_resume) + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, msm_pm_resume) SET_RUNTIME_PM_OPS(msm_runtime_suspend, msm_runtime_resume, NULL) + .prepare = msm_pm_prepare, + .complete = msm_pm_complete, }; /*
"The PM core always increments the runtime usage counter before calling the ->suspend() callback and decrements it after calling the ->resume() callback" DPU and DSI are managed as runtime devices. When suspend is triggered, PM core adds a refcount on all the devices and calls device suspend, since usage count is already incremented, runtime suspend was not getting called and it kept the clocks on which resulted in target not entering into XO shutdown. Add changes to force suspend on runtime devices during pm sleep. Changes in v1: - Remove unnecessary checks in the function _dpu_kms_disable_dpu (Rob Clark). Changes in v2: - Avoid using suspend_late to reset the usagecount as suspend_late might not be called during suspend call failures (Doug). Changes in v3: - Use force suspend instead of managing device usage_count via runtime put and get API's to trigger callbacks (Doug). Changes in v4: - Check the return values of pm_runtime_force_suspend and pm_runtime_force_resume API's and pass appropriately (Doug). Changes in v5: - With v4 patch, test cycle has uncovered issues in device resume. On bubs: cmd tx failures were seen as SW is sending panel off commands when the dsi resources are turned off. Upon suspend, DRM driver will issue a NULL composition to the dpu, followed by turning off all the HW blocks. v5 changes will serialize the NULL commit and resource unwinding by handling them under PM prepare and PM complete phases there by ensuring that clks are on when panel off commands are being processed. Signed-off-by: Kalyan Thota <kalyan_t@codeaurora.org> --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 ++ drivers/gpu/drm/msm/dsi/dsi.c | 2 ++ drivers/gpu/drm/msm/msm_drv.c | 20 ++++++++++++++++---- 3 files changed, 20 insertions(+), 4 deletions(-)