From: Doug Anderson <dianders@chromium.org>
To: Kalyan Thota <kalyan_t@codeaurora.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: Mon, 30 Mar 2020 11:55:25 -0700 [thread overview]
Message-ID: <CAD=FV=WcFahUm8jK+QTwx7BkCb3GTgKqFLP_pdqWBqN-zawrbw@mail.gmail.com> (raw)
In-Reply-To: <1585559008-12705-1-git-send-email-kalyan_t@codeaurora.org>
Hi,
On Mon, Mar 30, 2020 at 2:04 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 manage 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).
>
> Signed-off-by: Kalyan Thota <kalyan_t@codeaurora.org>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 33 +++++++++++++++++++++++++++++++++
> drivers/gpu/drm/msm/msm_drv.c | 4 ++++
> drivers/gpu/drm/msm/msm_kms.h | 2 ++
> 3 files changed, 39 insertions(+)
I am still 100% baffled by your patch and I never did quite understand
your response to my previous comments [1]. I think you're saying that
the problem you were facing is that if you call "suspend" but never
called "runtime_suspend" that the device stays active. Is that right?
If that's true, did you try something like this suggestion I made?
SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume)
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> index ce19f1d..2343cbd 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> @@ -26,6 +26,7 @@
> #include "dpu_encoder.h"
> #include "dpu_plane.h"
> #include "dpu_crtc.h"
> +#include "dsi.h"
>
> #define CREATE_TRACE_POINTS
> #include "dpu_trace.h"
> @@ -325,6 +326,37 @@ static void dpu_kms_disable_commit(struct msm_kms *kms)
> pm_runtime_put_sync(&dpu_kms->pdev->dev);
> }
>
> +static void _dpu_kms_disable_dpu(struct msm_kms *kms)
> +{
> + struct dpu_kms *dpu_kms = to_dpu_kms(kms);
> + struct drm_device *dev = dpu_kms->dev;
> + struct msm_drm_private *priv = dev->dev_private;
> + struct msm_dsi *dsi;
> + int i;
> +
> + dpu_kms_disable_commit(kms);
> +
> + for (i = 0; i < ARRAY_SIZE(priv->dsi); i++) {
> + if (!priv->dsi[i])
> + continue;
> + dsi = priv->dsi[i];
> + pm_runtime_put_sync(&dsi->pdev->dev);
> + }
> + pm_runtime_put_sync(dev->dev);
> +
> + /* Increment the usagecount without triggering a resume */
> + pm_runtime_get_noresume(dev->dev);
> +
> + pm_runtime_get_noresume(&dpu_kms->pdev->dev);
> +
> + for (i = 0; i < ARRAY_SIZE(priv->dsi); i++) {
> + if (!priv->dsi[i])
> + continue;
> + dsi = priv->dsi[i];
> + pm_runtime_get_noresume(&dsi->pdev->dev);
> + }
> +}
My pm_runtime knowledge is pretty weak sometimes, but the above
function looks crazy. Maybe it's just me not understanding, but can
you please summarize what you're trying to accomplish?
-Doug
[1] https://lore.kernel.org/r/114130f68c494f83303c51157e2c5bfa@codeaurora.org
next prev parent reply other threads:[~2020-03-30 18:55 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-30 9:03 [PATCH] drm/msm/dpu: ensure device suspend happens during PM sleep Kalyan Thota
2020-03-30 18:55 ` Doug Anderson [this message]
2020-03-31 14:05 ` [Freedreno] " kalyan_t
-- 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-31 13:58 Kalyan Thota
2020-03-31 16:00 ` Doug Anderson
2020-04-01 9:32 ` kalyan_t
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='CAD=FV=WcFahUm8jK+QTwx7BkCb3GTgKqFLP_pdqWBqN-zawrbw@mail.gmail.com' \
--to=dianders@chromium.org \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=hoegsberg@chromium.org \
--cc=jsanka@codeaurora.org \
--cc=kalyan_t@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).