From patchwork Mon Mar 30 09:03:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalyan Thota X-Patchwork-Id: 11465017 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 407EC13A4 for ; Mon, 30 Mar 2020 09:04:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 271E220733 for ; Mon, 30 Mar 2020 09:04:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729844AbgC3JEA (ORCPT ); Mon, 30 Mar 2020 05:04:00 -0400 Received: from alexa-out-blr-02.qualcomm.com ([103.229.18.198]:45369 "EHLO alexa-out-blr-02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729827AbgC3JEA (ORCPT ); Mon, 30 Mar 2020 05:04:00 -0400 Received: from ironmsg01-blr.qualcomm.com ([10.86.208.130]) by alexa-out-blr-02.qualcomm.com with ESMTP/TLS/AES256-SHA; 30 Mar 2020 14:33:56 +0530 Received: from kalyant-linux.qualcomm.com ([10.204.66.210]) by ironmsg01-blr.qualcomm.com with ESMTP; 30 Mar 2020 14:33:33 +0530 Received: by kalyant-linux.qualcomm.com (Postfix, from userid 94428) id 484A74725; Mon, 30 Mar 2020 14:33:32 +0530 (IST) From: Kalyan Thota To: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org Cc: Kalyan Thota , linux-kernel@vger.kernel.org, robdclark@gmail.com, seanpaul@chromium.org, hoegsberg@chromium.org, dianders@chromium.org, jsanka@codeaurora.org, mkrishn@codeaurora.org, travitej@codeaurora.org, nganji@codeaurora.org Subject: [PATCH] drm/msm/dpu: ensure device suspend happens during PM sleep Date: Mon, 30 Mar 2020 14:33:28 +0530 Message-Id: <1585559008-12705-1-git-send-email-kalyan_t@codeaurora.org> X-Mailer: git-send-email 1.9.1 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org "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 --- 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(+) 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); + } +} + static ktime_t dpu_kms_vsync_time(struct msm_kms *kms, struct drm_crtc *crtc) { struct drm_encoder *encoder; @@ -751,6 +783,7 @@ static void dpu_irq_uninstall(struct msm_kms *kms) #ifdef CONFIG_DEBUG_FS .debugfs_init = dpu_kms_debugfs_init, #endif + .disable_dpu = _dpu_kms_disable_dpu, }; static void _dpu_kms_mmu_destroy(struct dpu_kms *dpu_kms) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 7d985f8..bb11e00 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -1040,6 +1040,7 @@ static int msm_pm_suspend(struct device *dev) { struct drm_device *ddev = dev_get_drvdata(dev); struct msm_drm_private *priv = ddev->dev_private; + struct msm_kms *kms = priv->kms; if (WARN_ON(priv->pm_state)) drm_atomic_state_put(priv->pm_state); @@ -1051,6 +1052,9 @@ static int msm_pm_suspend(struct device *dev) return ret; } + if (kms->funcs->disable_dpu) + kms->funcs->disable_dpu(kms); + return 0; } diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h index 1cbef6b..c73a89b 100644 --- a/drivers/gpu/drm/msm/msm_kms.h +++ b/drivers/gpu/drm/msm/msm_kms.h @@ -126,6 +126,8 @@ struct msm_kms_funcs { /* debugfs: */ int (*debugfs_init)(struct msm_kms *kms, struct drm_minor *minor); #endif + void (*disable_dpu)(struct msm_kms *kms); + }; struct msm_kms;