diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-03-06 13:20:31 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-03-06 13:20:31 +0200 |
| commit | 0ba86d7edea1f9f2d9497c31200910263e8b4128 (patch) | |
| tree | 387f713e1afdd181e92699dcaa5fa3d45b30c75b /drivers/video/omap2/dss/hdmi.c | |
| parent | 973b659cbf2604b0b52829c224f6064d64118818 (diff) | |
| parent | 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d (diff) | |
| download | linux-3.10-0ba86d7edea1f9f2d9497c31200910263e8b4128.tar.gz linux-3.10-0ba86d7edea1f9f2d9497c31200910263e8b4128.tar.bz2 linux-3.10-0ba86d7edea1f9f2d9497c31200910263e8b4128.zip | |
Merge commit 'v3.3-rc6'
Merge v3.3-rc6 to get the latest DSS and OMAP arch fixes.
Conflicts:
arch/arm/mach-omap1/board-innovator.c
drivers/video/omap2/dss/apply.c
Diffstat (limited to 'drivers/video/omap2/dss/hdmi.c')
| -rw-r--r-- | drivers/video/omap2/dss/hdmi.c | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index 012ee49c78d..a229d0f8365 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c @@ -130,9 +130,25 @@ static int hdmi_runtime_get(void) DSSDBG("hdmi_runtime_get\n"); + /* + * HACK: Add dss_runtime_get() to ensure DSS clock domain is enabled. + * This should be removed later. + */ + r = dss_runtime_get(); + if (r < 0) + goto err_get_dss; + r = pm_runtime_get_sync(&hdmi.pdev->dev); WARN_ON(r < 0); - return r < 0 ? r : 0; + if (r < 0) + goto err_get_hdmi; + + return 0; + +err_get_hdmi: + dss_runtime_put(); +err_get_dss: + return r; } static void hdmi_runtime_put(void) @@ -143,6 +159,12 @@ static void hdmi_runtime_put(void) r = pm_runtime_put_sync(&hdmi.pdev->dev); WARN_ON(r < 0); + + /* + * HACK: This is added to complement the dss_runtime_get() call in + * hdmi_runtime_get(). This should be removed later. + */ + dss_runtime_put(); } int hdmi_init_display(struct omap_dss_device *dssdev) |