From patchwork Mon Nov 18 12:50:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 3196511 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D8647C045B for ; Mon, 18 Nov 2013 12:50:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AB8FA20620 for ; Mon, 18 Nov 2013 12:50:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4882C2061D for ; Mon, 18 Nov 2013 12:50:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751607Ab3KRMuX (ORCPT ); Mon, 18 Nov 2013 07:50:23 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:54191 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751597Ab3KRMuW (ORCPT ); Mon, 18 Nov 2013 07:50:22 -0500 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id rAICoLhm000791; Mon, 18 Nov 2013 06:50:21 -0600 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id rAICoLtE014874; Mon, 18 Nov 2013 06:50:21 -0600 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.2.342.3; Mon, 18 Nov 2013 06:50:21 -0600 Received: from deskari.tieu.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id rAICoCV9002852; Mon, 18 Nov 2013 06:50:20 -0600 From: Tomi Valkeinen To: , CC: Archit Taneja , Tomi Valkeinen Subject: [PATCH 5/6] OMAPDSS: add debug print for runtime suspend/resume Date: Mon, 18 Nov 2013 14:50:08 +0200 Message-ID: <1384779009-10512-6-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1384779009-10512-1-git-send-email-tomi.valkeinen@ti.com> References: <1384779009-10512-1-git-send-email-tomi.valkeinen@ti.com> MIME-Version: 1.0 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Add consistent debug prints on all suspend & resume callbacks in omapdss to make it simpler to debug runtime PM. Signed-off-by: Tomi Valkeinen --- drivers/video/omap2/dss/dispc.c | 4 ++++ drivers/video/omap2/dss/dsi.c | 4 ++++ drivers/video/omap2/dss/dss.c | 5 +++++ drivers/video/omap2/dss/hdmi4.c | 4 ++++ drivers/video/omap2/dss/rfbi.c | 4 ++++ drivers/video/omap2/dss/venc.c | 4 ++++ 6 files changed, 25 insertions(+) diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 54716ad..58f3626 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -3475,11 +3475,15 @@ static int __exit omap_dispchw_remove(struct platform_device *pdev) static int dispc_runtime_suspend(struct device *dev) { + DSSDBG("suspend\n"); + return 0; } static int dispc_runtime_resume(struct device *dev) { + DSSDBG("resume\n"); + _omap_dispc_initial_config(); return 0; diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index 6056b27..6b30a58 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -5477,6 +5477,8 @@ static int __exit omap_dsihw_remove(struct platform_device *dsidev) static int dsi_runtime_suspend(struct device *dev) { + DSSDBG("suspend\n"); + dispc_runtime_put(); return 0; @@ -5486,6 +5488,8 @@ static int dsi_runtime_resume(struct device *dev) { int r; + DSSDBG("resume\n"); + r = dispc_runtime_get(); if (r) return r; diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c index 0b78c89..fa7bc00 100644 --- a/drivers/video/omap2/dss/dss.c +++ b/drivers/video/omap2/dss/dss.c @@ -872,6 +872,8 @@ static int __exit omap_dsshw_remove(struct platform_device *pdev) static int dss_runtime_suspend(struct device *dev) { + DSSDBG("suspend\n"); + dss.ctx.control = dss_read_reg(DSS_CONTROL); if (dss_feat_get_supported_displays(OMAP_DSS_CHANNEL_LCD) & @@ -889,6 +891,9 @@ static int dss_runtime_suspend(struct device *dev) static int dss_runtime_resume(struct device *dev) { int r; + + DSSDBG("resume\n"); + /* * Set an arbitrarily high tput request to ensure OPP100. * What we should really do is to make a request to stay in OPP100, diff --git a/drivers/video/omap2/dss/hdmi4.c b/drivers/video/omap2/dss/hdmi4.c index e140096..f1a45fe 100644 --- a/drivers/video/omap2/dss/hdmi4.c +++ b/drivers/video/omap2/dss/hdmi4.c @@ -650,6 +650,8 @@ static int __exit omapdss_hdmihw_remove(struct platform_device *pdev) static int hdmi_runtime_suspend(struct device *dev) { + DSSDBG("suspend\n"); + clk_disable_unprepare(hdmi.sys_clk); dispc_runtime_put(); @@ -661,6 +663,8 @@ static int hdmi_runtime_resume(struct device *dev) { int r; + DSSDBG("resume\n"); + r = dispc_runtime_get(); if (r < 0) return r; diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c index c8a81a2..74d3ed1 100644 --- a/drivers/video/omap2/dss/rfbi.c +++ b/drivers/video/omap2/dss/rfbi.c @@ -1016,6 +1016,8 @@ static int __exit omap_rfbihw_remove(struct platform_device *pdev) static int rfbi_runtime_suspend(struct device *dev) { + DSSDBG("suspend\n"); + dispc_runtime_put(); return 0; @@ -1025,6 +1027,8 @@ static int rfbi_runtime_resume(struct device *dev) { int r; + DSSDBG("resume\n"); + r = dispc_runtime_get(); if (r < 0) return r; diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index 5f88ac4..e173961 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c @@ -867,6 +867,8 @@ static int __exit omap_venchw_remove(struct platform_device *pdev) static int venc_runtime_suspend(struct device *dev) { + DSSDBG("suspend\n"); + if (venc.tv_dac_clk) clk_disable_unprepare(venc.tv_dac_clk); @@ -879,6 +881,8 @@ static int venc_runtime_resume(struct device *dev) { int r; + DSSDBG("resume\n"); + r = dispc_runtime_get(); if (r < 0) return r;