From: kalyan_t@codeaurora.org
To: Doug Anderson <dianders@chromium.org>
Cc: dri-devel <dri-devel@lists.freedesktop.org>,
linux-arm-msm <linux-arm-msm@vger.kernel.org>,
freedreno <freedreno@lists.freedesktop.org>,
"open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS"
<devicetree@vger.kernel.org>, LKML <linux-kernel@vger.kernel.org>,
Rob Clark <robdclark@gmail.com>,
Sean Paul <seanpaul@chromium.org>,
"Kristian H. Kristensen" <hoegsberg@chromium.org>,
Jeykumar Sankaran <jsanka@codeaurora.org>,
mkrishn@codeaurora.org, travitej@codeaurora.org,
nganji@codeaurora.org
Subject: Re: [PATCH] drm/msm/dpu: ensure device suspend happens during PM sleep
Date: Wed, 01 Apr 2020 15:02:21 +0530 [thread overview]
Message-ID: <2922a0c64ec61c3d74d516e44dca2d71@codeaurora.org> (raw)
In-Reply-To: <CAD=FV=Up4y6GUkJc8NNJBdC28L+6LvUs7pCUg4pyMCgHMGEkug@mail.gmail.com>
On 2020-03-31 21:30, Doug Anderson wrote:
> Hi,
>
> On Tue, Mar 31, 2020 at 6:58 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).
>>
>> 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 | 4 ++++
>> 3 files changed, 8 insertions(+)
>
> This looks much saner to me. Thanks! I assume it still works fine
> for you? I'm still no expert on how all the pieces of DRM drivers
> work together, but at least there's not a bunch of strange fiddling
> with pm_runtime state and hopefully it will avoid weird corner
> cases...
>
--- Yes, verified the change on trogdor device, and display can suspend
with the change.
>
>> 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..2b8c99c 100644
>> --- a/drivers/gpu/drm/msm/msm_drv.c
>> +++ b/drivers/gpu/drm/msm/msm_drv.c
>> @@ -1051,6 +1051,8 @@ static int msm_pm_suspend(struct device *dev)
>> return ret;
>> }
>>
>> + pm_runtime_force_suspend(dev);
>
> nit: check return value of pm_runtime_force_suspend()?
>
>
>> +
>> return 0;
>> }
>>
>> @@ -1063,6 +1065,8 @@ static int msm_pm_resume(struct device *dev)
>> if (WARN_ON(!priv->pm_state))
>> return -ENOENT;
>>
>> + pm_runtime_force_resume(dev);
>
> nit: check return value of pm_runtime_force_resume()?
>
>
> -Doug
next prev parent reply other threads:[~2020-04-01 9:32 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-31 13:58 [PATCH] drm/msm/dpu: ensure device suspend happens during PM sleep Kalyan Thota
2020-03-31 16:00 ` Doug Anderson
2020-04-01 9:32 ` kalyan_t [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-05-01 13:31 Kalyan Thota
2020-05-14 16:17 ` Doug Anderson
2020-04-17 7:12 Kalyan Thota
2020-04-17 20:56 ` Doug Anderson
2020-03-30 9:03 Kalyan Thota
2020-03-30 18:55 ` Doug Anderson
2020-03-23 6:13 Kalyan Thota
2020-03-24 14:35 ` Doug Anderson
2020-03-25 15:40 ` Rob Clark
2020-03-25 15:50 ` Doug Anderson
2020-03-25 20:03 ` kalyan_t
2020-03-16 11:05 Kalyan Thota
2020-03-16 16:38 ` Rob Clark
2020-03-17 21:38 ` Doug Anderson
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=2922a0c64ec61c3d74d516e44dca2d71@codeaurora.org \
--to=kalyan_t@codeaurora.org \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=hoegsberg@chromium.org \
--cc=jsanka@codeaurora.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mkrishn@codeaurora.org \
--cc=nganji@codeaurora.org \
--cc=robdclark@gmail.com \
--cc=seanpaul@chromium.org \
--cc=travitej@codeaurora.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).