diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-10-23 06:46:12 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-12-07 10:05:54 -0500 |
commit | 23dfd1ac87b56652e618fda24b035505c89c4b8c (patch) | |
tree | feb6e4366870e3c690c84bbdccfae960a6e64139 /drivers/video/omap2/dss/apply.c | |
parent | 8dd2491a4216778a81668581041ba1c06453ed6c (diff) |
OMAPDSS: move ovl & ovl-mgr init to apply.c
Overlay and overlay_manager structs will only be needed in the compat
mode.
This patch moves initialization of overlay and overlay_manager structs
to apply.c, so that they are handled in omapdss_compat_init().
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/apply.c')
-rw-r--r-- | drivers/video/omap2/dss/apply.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c index ba1343274bb7..6f60d0e0b7ee 100644 --- a/drivers/video/omap2/dss/apply.c +++ b/drivers/video/omap2/dss/apply.c | |||
@@ -1469,6 +1469,8 @@ static DEFINE_MUTEX(compat_init_lock); | |||
1469 | 1469 | ||
1470 | int omapdss_compat_init(void) | 1470 | int omapdss_compat_init(void) |
1471 | { | 1471 | { |
1472 | struct platform_device *pdev = dss_get_core_pdev(); | ||
1473 | |||
1472 | mutex_lock(&compat_init_lock); | 1474 | mutex_lock(&compat_init_lock); |
1473 | 1475 | ||
1474 | if (compat_refcnt++ > 0) | 1476 | if (compat_refcnt++ > 0) |
@@ -1476,6 +1478,9 @@ int omapdss_compat_init(void) | |||
1476 | 1478 | ||
1477 | apply_init_priv(); | 1479 | apply_init_priv(); |
1478 | 1480 | ||
1481 | dss_init_overlay_managers(pdev); | ||
1482 | dss_init_overlays(pdev); | ||
1483 | |||
1479 | out: | 1484 | out: |
1480 | mutex_unlock(&compat_init_lock); | 1485 | mutex_unlock(&compat_init_lock); |
1481 | 1486 | ||
@@ -1485,11 +1490,15 @@ EXPORT_SYMBOL(omapdss_compat_init); | |||
1485 | 1490 | ||
1486 | void omapdss_compat_uninit(void) | 1491 | void omapdss_compat_uninit(void) |
1487 | { | 1492 | { |
1493 | struct platform_device *pdev = dss_get_core_pdev(); | ||
1494 | |||
1488 | mutex_lock(&compat_init_lock); | 1495 | mutex_lock(&compat_init_lock); |
1489 | 1496 | ||
1490 | if (--compat_refcnt > 0) | 1497 | if (--compat_refcnt > 0) |
1491 | goto out; | 1498 | goto out; |
1492 | 1499 | ||
1500 | dss_uninit_overlay_managers(pdev); | ||
1501 | dss_uninit_overlays(pdev); | ||
1493 | out: | 1502 | out: |
1494 | mutex_unlock(&compat_init_lock); | 1503 | mutex_unlock(&compat_init_lock); |
1495 | } | 1504 | } |