Add consistent debug prints on all suspend & resume callbacks in omapdss
to make it simpler to debug runtime PM.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@xxxxxx>
---
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;
--
1.8.3.2
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
