From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08FE7C18E5B for ; Mon, 16 Mar 2020 11:06:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D591220719 for ; Mon, 16 Mar 2020 11:06:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730691AbgCPLGk (ORCPT ); Mon, 16 Mar 2020 07:06:40 -0400 Received: from alexa-out-blr-02.qualcomm.com ([103.229.18.198]:17754 "EHLO alexa-out-blr-02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730645AbgCPLGk (ORCPT ); Mon, 16 Mar 2020 07:06:40 -0400 Received: from ironmsg01-blr.qualcomm.com ([10.86.208.130]) by alexa-out-blr-02.qualcomm.com with ESMTP/TLS/AES256-SHA; 16 Mar 2020 16:35:37 +0530 Received: from kalyant-linux.qualcomm.com ([10.204.66.210]) by ironmsg01-blr.qualcomm.com with ESMTP; 16 Mar 2020 16:35:30 +0530 Received: by kalyant-linux.qualcomm.com (Postfix, from userid 94428) id C1AE946DA; Mon, 16 Mar 2020 16:35:29 +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, travitej@codeaurora.org Subject: [PATCH] drm/msm/dpu: ensure device suspend happens during PM sleep Date: Mon, 16 Mar 2020 16:35:20 +0530 Message-Id: <1584356720-24411-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. Signed-off-by: Kalyan Thota --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 41 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/msm/dsi/dsi.c | 7 ++++++ drivers/gpu/drm/msm/msm_drv.c | 14 +++++++++++ drivers/gpu/drm/msm/msm_kms.h | 2 ++ 4 files changed, 64 insertions(+) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index cb08faf..6e103d5 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" @@ -250,6 +251,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 drm_device *dev; + struct msm_drm_private *priv; + struct dpu_kms *dpu_kms; + int i = 0; + struct msm_dsi *dsi; + + dpu_kms = to_dpu_kms(kms); + dev = dpu_kms->dev; + if (!dev) { + DPU_ERROR("invalid device\n"); + return; + } + + priv = dev->dev_private; + if (!priv) { + DPU_ERROR("invalid private data\n"); + return; + } + + 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); + } +} + static ktime_t dpu_kms_vsync_time(struct msm_kms *kms, struct drm_crtc *crtc) { struct drm_encoder *encoder; @@ -683,6 +715,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) @@ -1053,7 +1086,15 @@ static int __maybe_unused dpu_runtime_resume(struct device *dev) return rc; } + +static int __maybe_unused dpu_pm_suspend_late(struct device *dev) +{ + pm_runtime_get_noresume(dev); + return 0; +} + static const struct dev_pm_ops dpu_pm_ops = { + SET_LATE_SYSTEM_SLEEP_PM_OPS(dpu_pm_suspend_late, NULL) SET_RUNTIME_PM_OPS(dpu_runtime_suspend, dpu_runtime_resume, NULL) }; diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 55ea4bc2..3d3740e 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -154,12 +154,19 @@ static int dsi_dev_remove(struct platform_device *pdev) return 0; } +static int __maybe_unused dsi_pm_suspend_late(struct device *dev) +{ + pm_runtime_get_noresume(dev); + return 0; +} + static const struct of_device_id dt_match[] = { { .compatible = "qcom,mdss-dsi-ctrl" }, {} }; static const struct dev_pm_ops dsi_pm_ops = { + SET_LATE_SYSTEM_SLEEP_PM_OPS(dsi_pm_suspend_late, NULL) SET_RUNTIME_PM_OPS(msm_dsi_runtime_suspend, msm_dsi_runtime_resume, NULL) }; diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index e4b750b..12ec1c6 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -1038,6 +1038,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); @@ -1049,6 +1050,11 @@ static int msm_pm_suspend(struct device *dev) return ret; } + if (kms->funcs->disable_dpu) + kms->funcs->disable_dpu(kms); + + pm_runtime_put_sync(dev); + return 0; } @@ -1067,6 +1073,13 @@ static int msm_pm_resume(struct device *dev) return ret; } + +static int msm_pm_suspend_late(struct device *dev) +{ + pm_runtime_get_noresume(dev); + return 0; +} + #endif #ifdef CONFIG_PM @@ -1100,6 +1113,7 @@ static int msm_runtime_resume(struct device *dev) #endif static const struct dev_pm_ops msm_pm_ops = { + SET_LATE_SYSTEM_SLEEP_PM_OPS(msm_pm_suspend_late, NULL) SET_SYSTEM_SLEEP_PM_OPS(msm_pm_suspend, msm_pm_resume) SET_RUNTIME_PM_OPS(msm_runtime_suspend, msm_runtime_resume, NULL) }; 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; -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54953C18E5B for ; Tue, 17 Mar 2020 14:17:15 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3254D2051A for ; Tue, 17 Mar 2020 14:17:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3254D2051A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C7E7C6E16D; Tue, 17 Mar 2020 14:16:42 +0000 (UTC) X-Greylist: delayed 369 seconds by postgrey-1.36 at gabe; Mon, 16 Mar 2020 11:11:47 UTC Received: from alexa-out-blr-01.qualcomm.com (alexa-out-blr-01.qualcomm.com [103.229.18.197]) by gabe.freedesktop.org (Postfix) with ESMTPS id CA1BB6E3F3; Mon, 16 Mar 2020 11:11:47 +0000 (UTC) Received: from ironmsg01-blr.qualcomm.com ([10.86.208.130]) by alexa-out-blr-01.qualcomm.com with ESMTP/TLS/AES256-SHA; 16 Mar 2020 16:35:36 +0530 Received: from kalyant-linux.qualcomm.com ([10.204.66.210]) by ironmsg01-blr.qualcomm.com with ESMTP; 16 Mar 2020 16:35:30 +0530 Received: by kalyant-linux.qualcomm.com (Postfix, from userid 94428) id C1AE946DA; Mon, 16 Mar 2020 16:35:29 +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 Subject: [PATCH] drm/msm/dpu: ensure device suspend happens during PM sleep Date: Mon, 16 Mar 2020 16:35:20 +0530 Message-Id: <1584356720-24411-1-git-send-email-kalyan_t@codeaurora.org> X-Mailer: git-send-email 1.9.1 X-Mailman-Approved-At: Tue, 17 Mar 2020 14:16:40 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: travitej@codeaurora.org, dianders@chromium.org, linux-kernel@vger.kernel.org, seanpaul@chromium.org, Kalyan Thota , hoegsberg@chromium.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" "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. Signed-off-by: Kalyan Thota --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 41 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/msm/dsi/dsi.c | 7 ++++++ drivers/gpu/drm/msm/msm_drv.c | 14 +++++++++++ drivers/gpu/drm/msm/msm_kms.h | 2 ++ 4 files changed, 64 insertions(+) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index cb08faf..6e103d5 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" @@ -250,6 +251,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 drm_device *dev; + struct msm_drm_private *priv; + struct dpu_kms *dpu_kms; + int i = 0; + struct msm_dsi *dsi; + + dpu_kms = to_dpu_kms(kms); + dev = dpu_kms->dev; + if (!dev) { + DPU_ERROR("invalid device\n"); + return; + } + + priv = dev->dev_private; + if (!priv) { + DPU_ERROR("invalid private data\n"); + return; + } + + 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); + } +} + static ktime_t dpu_kms_vsync_time(struct msm_kms *kms, struct drm_crtc *crtc) { struct drm_encoder *encoder; @@ -683,6 +715,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) @@ -1053,7 +1086,15 @@ static int __maybe_unused dpu_runtime_resume(struct device *dev) return rc; } + +static int __maybe_unused dpu_pm_suspend_late(struct device *dev) +{ + pm_runtime_get_noresume(dev); + return 0; +} + static const struct dev_pm_ops dpu_pm_ops = { + SET_LATE_SYSTEM_SLEEP_PM_OPS(dpu_pm_suspend_late, NULL) SET_RUNTIME_PM_OPS(dpu_runtime_suspend, dpu_runtime_resume, NULL) }; diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 55ea4bc2..3d3740e 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -154,12 +154,19 @@ static int dsi_dev_remove(struct platform_device *pdev) return 0; } +static int __maybe_unused dsi_pm_suspend_late(struct device *dev) +{ + pm_runtime_get_noresume(dev); + return 0; +} + static const struct of_device_id dt_match[] = { { .compatible = "qcom,mdss-dsi-ctrl" }, {} }; static const struct dev_pm_ops dsi_pm_ops = { + SET_LATE_SYSTEM_SLEEP_PM_OPS(dsi_pm_suspend_late, NULL) SET_RUNTIME_PM_OPS(msm_dsi_runtime_suspend, msm_dsi_runtime_resume, NULL) }; diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index e4b750b..12ec1c6 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -1038,6 +1038,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); @@ -1049,6 +1050,11 @@ static int msm_pm_suspend(struct device *dev) return ret; } + if (kms->funcs->disable_dpu) + kms->funcs->disable_dpu(kms); + + pm_runtime_put_sync(dev); + return 0; } @@ -1067,6 +1073,13 @@ static int msm_pm_resume(struct device *dev) return ret; } + +static int msm_pm_suspend_late(struct device *dev) +{ + pm_runtime_get_noresume(dev); + return 0; +} + #endif #ifdef CONFIG_PM @@ -1100,6 +1113,7 @@ static int msm_runtime_resume(struct device *dev) #endif static const struct dev_pm_ops msm_pm_ops = { + SET_LATE_SYSTEM_SLEEP_PM_OPS(msm_pm_suspend_late, NULL) SET_SYSTEM_SLEEP_PM_OPS(msm_pm_suspend, msm_pm_resume) SET_RUNTIME_PM_OPS(msm_runtime_suspend, msm_runtime_resume, NULL) }; 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; -- 1.9.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel