From patchwork Wed Jan 23 11:12:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jayant Shekhar X-Patchwork-Id: 10777089 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1FA43139A for ; Wed, 23 Jan 2019 11:12:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10C6C2BD17 for ; Wed, 23 Jan 2019 11:12:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 04C8C2BD2E; Wed, 23 Jan 2019 11:12:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D4082BD17 for ; Wed, 23 Jan 2019 11:12:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727309AbfAWLMz (ORCPT ); Wed, 23 Jan 2019 06:12:55 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:35012 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727227AbfAWLMy (ORCPT ); Wed, 23 Jan 2019 06:12:54 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 44DD76014B; Wed, 23 Jan 2019 11:12:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1548241973; bh=yx/RqyJ4hWDcNmGbeUJdRdVXCtvBV8K5olsKzX+lf5E=; h=From:To:Cc:Subject:Date:From; b=Z9aAMB+O9zScpowUq/MJPgaRO+2nF+UejZ1vxjzDA13o+KnpDSKA3zygqfJOw6FNS 2PTI2Ey7hML4BCc8bXvk85wiAMoqmB3rwQP1Nf5nxQ6DhiFBDEO9XDbWxe7yh+fHp3 oraAaS9GY5df9rohLT2uk1QMSuXjOr7gzNizQ3kI= Received: from jshekhar-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: jshekhar@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 8E71E6049C; Wed, 23 Jan 2019 11:12:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1548241972; bh=yx/RqyJ4hWDcNmGbeUJdRdVXCtvBV8K5olsKzX+lf5E=; h=From:To:Cc:Subject:Date:From; b=kt7am6XZR19AsRDF8iu/ffgBlSUzmQwVTq2CRhBKMnPcNk8vtqYDkQh60PxvpmHto RXmL5TFVr0Lag6e5To8eGhSUkct3yfpgL624I1LYJZ1/HkVLBwN8crwd8bMptWb7gK RXK/7+kfOyRsDAbbOX+ye9H7Oqatz/GY/zh2fQnk= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 8E71E6049C Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=jshekhar@codeaurora.org From: Jayant Shekhar To: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org Cc: Jayant Shekhar , linux-kernel@vger.kernel.org, robdclark@gmail.com, seanpaul@chromium.org, hoegsberg@chromium.org, abhinavk@codeaurora.org, jsanka@codeaurora.org, chandanu@codeaurora.org, nganji@codeaurora.org Subject: [v1] drm/msm: Remove clock and bandwidth votes in mdss pm suspend Date: Wed, 23 Jan 2019 16:42:40 +0530 Message-Id: <1548241960-7412-1-git-send-email-jshekhar@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 X-Virus-Scanned: ClamAV using ClamSMTP MDSS PM suspend is dependent on runtime suspend for disabling clocks and removing bandwidth votes. In case of pm_suspend triggered, dpm_prepare hold a refcount on power usage of device and hence runtime suspend is never triggered during pm_suspend. As runtime suspend is not triggered, clocks and bandwidth votes remain. Hence explicitly trigger mdss disable in msm_pm_suspend to disable clocks and remove the votes. Signed-off-by: Jayant Shekhar --- drivers/gpu/drm/msm/msm_drv.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 5c60bb3..ffe3a25 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -1068,12 +1068,16 @@ 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_mdss *mdss = priv->mdss; if (!IS_ERR_OR_NULL(priv->pm_state)) return 0; priv->pm_state = drm_atomic_helper_suspend(ddev); + if (mdss && mdss->funcs) + mdss->funcs->disable(mdss); + return IS_ERR(priv->pm_state) ? PTR_ERR(priv->pm_state) : 0; } @@ -1081,11 +1085,15 @@ static int msm_pm_resume(struct device *dev) { struct drm_device *ddev = dev_get_drvdata(dev); struct msm_drm_private *priv = ddev->dev_private; + struct msm_mdss *mdss = priv->mdss; int ret; if (IS_ERR_OR_NULL(priv->pm_state)) return 0; + if (mdss && mdss->funcs) + mdss->funcs->enable(mdss); + ret = drm_atomic_helper_resume(ddev, priv->pm_state); if (ret == 0) priv->pm_state = NULL;