From patchwork Thu Nov 26 11:53:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?64yA7J246riwL1RpemVuIFBsYXRmb3JtIExhYihTUikv7IK87ISx7KCE7J6Q?= X-Patchwork-Id: 7706101 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F0AF3C05CA for ; Thu, 26 Nov 2015 11:54:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2625B207E1 for ; Thu, 26 Nov 2015 11:54:04 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2C458207D3 for ; Thu, 26 Nov 2015 11:54:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C7FCA6E05F; Thu, 26 Nov 2015 03:54:00 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6CF1A6E05F for ; Thu, 26 Nov 2015 03:53:59 -0800 (PST) Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NYF02E167PXM2C0@mailout3.samsung.com> for dri-devel@lists.freedesktop.org; Thu, 26 Nov 2015 20:53:57 +0900 (KST) Received: from epcpsbgm2new.samsung.com ( [172.20.52.113]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 6D.FC.27792.5D2F6565; Thu, 26 Nov 2015 20:53:57 +0900 (KST) X-AuditID: cbfee691-f79bf6d000006c90-52-5656f2d5c482 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id F3.D7.00996.5D2F6565; Thu, 26 Nov 2015 20:53:57 +0900 (KST) Received: from localhost.localdomain ([10.252.83.67]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NYF00KJ47PV2MC1@mmp1.samsung.com>; Thu, 26 Nov 2015 20:53:57 +0900 (KST) From: Inki Dae To: dri-devel@lists.freedesktop.org Subject: [PATCH v3] drm/exynos: add pm_runtime to HDMI Date: Thu, 26 Nov 2015 20:53:53 +0900 Message-id: <1448538834-26378-4-git-send-email-inki.dae@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1448538834-26378-1-git-send-email-inki.dae@samsung.com> References: <1448538834-26378-1-git-send-email-inki.dae@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsWyRsSkUPfqp7Awg6frVCx6z51ksrjy9T2b xafVrewWk+5PYLGYcX4fkwOrx9/n11k8tn97wOpxv/s4k0ffllWMHp83yQWwRnHZpKTmZJal FunbJXBlrNwuXLBdsuLEp9/sDYwNol2MnBwSAiYSS+52skPYYhIX7q1n62Lk4hASWMEo0bjv GQtM0bejn9ghEksZJeYc28wI4XxnlPjw+z0jSBWbgKrExBX32UBsEQFlib8TV4HFmQX6GSV+ nFcAsYUFzCT+P2oCi7MA1e+ecxpsNa+Ai8Sz9ROgtslJnDw2mRXE5hRwlVi1/B5YXAioprfx Bth5EgLd7BJ3Gz6xQgwSkPg2+RBQEQdQQlZi0wFmiDmSEgdX3GCZwCi8gJFhFaNoakFyQXFS epGpXnFibnFpXrpecn7uJkZgSJ/+92ziDsb7B6wPMQpwMCrx8BbYhoUJsSaWFVfmHmI0Bdow kVlKNDkfGDl5JfGGxmZGFqYmpsZG5pZmSuK8OtI/g4UE0hNLUrNTUwtSi+KLSnNSiw8xMnFw SjUweot+05p+OojnM1vGuhsSmjOOzp4osK37288JujrMs7bv+RiqHvBd8H9Mm/Qrt7Otf7cW fDlwUfvNnupLS+fv9Jn6Xv/4WvaQJcEPPpqePrdKU8pqc3XLPY8f215dv330NHd60Y0VTN2p Bzj9o6853l+w4ZPPr0vzgrkvFvI/5rrepTTp9PFXW4OVWIozEg21mIuKEwEUcPEXZAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprHIsWRmVeSWpSXmKPExsVy+t9jAd2rn8LCDE4flrfoPXeSyeLK1/ds Fp9Wt7JbTLo/gcVixvl9TA6sHn+fX2fx2P7tAavH/e7jTB59W1YxenzeJBfAGtXAaJORmpiS WqSQmpecn5KZl26r5B0c7xxvamZgqGtoaWGupJCXmJtqq+TiE6DrlpkDtF1JoSwxpxQoFJBY XKykb4dpQmiIm64FTGOErm9IEFyPkQEaSFjDmLFyu3DBdsmKE59+szcwNoh2MXJySAiYSHw7 +okdwhaTuHBvPVsXIxeHkMBSRok5xzYzQjjfGSU+/H7PCFLFJqAqMXHFfTYQW0RAWeLvxFVg cWaBfkaJH+cVQGxhATOJ/4+awOIsQPW755wG28Ar4CLxbP0EFohtchInj01mBbE5BVwlVi2/ BxYXAqrpbbzBNoGRdwEjwypGidSC5ILipPRco7zUcr3ixNzi0rx0veT83E2M4Lh5Jr2D8fAu 90OMAhyMSjy8BbZhYUKsiWXFlbmHGCU4mJVEeL88BArxpiRWVqUW5ccXleakFh9iNAU6bCKz lGhyPjCm80riDY1NzIwsjcwNLYyMzZXEeS/s9wsTEkhPLEnNTk0tSC2C6WPi4JRqYJRYPE/k 9FO7YyELNcws1Y+v5dzk07O9Yv+yNbcuH5J3XfbZJvPXj1m12SU3Rewue+uKRF47pP30RNrN a7y7Q72ucQifcg6oPVp7R3ND8HujiuLEe2Udy6Z9UdLflucdJSm4ftH3NdVKW3ZxznohdtFx oxzbT9WYE2VH+o+fuXeLO/aIo2xzW5oSS3FGoqEWc1FxIgD1dJuysQIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: linux-samsung-soc@vger.kernel.org, Gustavo Padovan X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Gustavo Padovan Let pm_runtime handle the enabling/disabling of the device with proper refcnt instead of rely on specific flags to track the enabled state. Changelog v3: - revive powered flag to keep current dpms mode Changelog v2: - Mofidy CONFIG_PM_SLEEP -> CONFIG_PM Signed-off-by: Gustavo Padovan Signed-off-by: Inki Dae --- drivers/gpu/drm/exynos/exynos_hdmi.c | 49 +++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 57b6755..9a955d2 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -113,7 +113,7 @@ struct hdmi_context { void __iomem *regs_hdmiphy; struct i2c_client *hdmiphy_port; struct i2c_adapter *ddc_adpt; - struct gpio_desc *hpd_gpio; + struct gpio_desc *hpd_gpio; int irq; struct regmap *pmureg; struct clk *hdmi; @@ -1588,8 +1588,6 @@ static void hdmi_enable(struct drm_encoder *encoder) if (hdata->powered) return; - hdata->powered = true; - pm_runtime_get_sync(hdata->dev); if (regulator_bulk_enable(ARRAY_SIZE(supply), hdata->regul_bulk)) @@ -1599,10 +1597,9 @@ static void hdmi_enable(struct drm_encoder *encoder) regmap_update_bits(hdata->pmureg, PMU_HDMI_PHY_CONTROL, PMU_HDMI_PHY_ENABLE_BIT, 1); - clk_prepare_enable(hdata->hdmi); - clk_prepare_enable(hdata->sclk_hdmi); - hdmi_conf_apply(hdata); + + hdata->powered = true; } static void hdmi_disable(struct drm_encoder *encoder) @@ -1633,9 +1630,6 @@ static void hdmi_disable(struct drm_encoder *encoder) cancel_delayed_work(&hdata->hotplug_work); - clk_disable_unprepare(hdata->sclk_hdmi); - clk_disable_unprepare(hdata->hdmi); - /* reset pmu hdmiphy control bit to disable hdmiphy */ regmap_update_bits(hdata->pmureg, PMU_HDMI_PHY_CONTROL, PMU_HDMI_PHY_ENABLE_BIT, 0); @@ -1978,12 +1972,49 @@ static int hdmi_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM +static int exynos_hdmi_suspend(struct device *dev) +{ + struct hdmi_context *hdata = dev_get_drvdata(dev); + + clk_disable_unprepare(hdata->sclk_hdmi); + clk_disable_unprepare(hdata->hdmi); + + return 0; +} + +static int exynos_hdmi_resume(struct device *dev) +{ + struct hdmi_context *hdata = dev_get_drvdata(dev); + int ret; + + ret = clk_prepare_enable(hdata->hdmi); + if (ret < 0) { + DRM_ERROR("Failed to prepare_enable the hdmi clk [%d]\n", ret); + return ret; + } + ret = clk_prepare_enable(hdata->sclk_hdmi); + if (ret < 0) { + DRM_ERROR("Failed to prepare_enable the sclk_mixer clk [%d]\n", + ret); + return ret; + } + + return 0; +} +#endif + +static const struct dev_pm_ops exynos_hdmi_pm_ops = { + SET_RUNTIME_PM_OPS(exynos_hdmi_suspend, exynos_hdmi_resume, NULL) +}; + struct platform_driver hdmi_driver = { .probe = hdmi_probe, .remove = hdmi_remove, .driver = { .name = "exynos-hdmi", .owner = THIS_MODULE, + .pm = &exynos_hdmi_pm_ops, .of_match_table = hdmi_match_types, }, };