From bf195a0f9a9a3b9a354f4703f6686fac5f01848b Mon Sep 17 00:00:00 2001 From: Andy Green Date: Tue, 27 Dec 2011 16:06:54 +0800 Subject: omap dss test dss rpm disabled before blowing warning Signed-off-by: Andy Green --- drivers/video/omap2/dss/dss.c | 5 +++++ drivers/video/omap2/dss/hdmi.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c index 0bcb94376c0..ac9f2a85a45 100644 --- a/drivers/video/omap2/dss/dss.c +++ b/drivers/video/omap2/dss/dss.c @@ -699,6 +699,11 @@ struct clk *dss_get_ick(void) return clk_get(&dss.pdev->dev, "ick"); } +int dss_runtime_pm_enabled(void) +{ + return pm_runtime_enabled(&dss.pdev->dev); +} + int dss_runtime_get(void) { int r; diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index b9d86301bc7..40398f7ec2e 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c @@ -779,6 +779,9 @@ static int hdmi_runtime_resume(struct device *dev) clk_enable(hdmi.sys_clk); + if (!dss_runtime_pm_enabled()) + return -EBUSY; + r = dss_runtime_get(); if (r < 0) goto err_get_dss; -- cgit v1.2.3