diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-11-07 15:04:01 +0200 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-12-02 08:54:32 +0200 |
commit | 04f6643a8657bd080344d2928dde917e0b1b3800 (patch) | |
tree | aacb164ba4e83c00d1376f0d5a8c93dab5335e48 /drivers/video/omap2/dss/apply.c | |
parent | 18135eadac6f0fd1bf61b7af24f14e7174155e6d (diff) | |
download | op-kernel-dev-04f6643a8657bd080344d2928dde917e0b1b3800.zip op-kernel-dev-04f6643a8657bd080344d2928dde917e0b1b3800.tar.gz |
OMAPDSS: APPLY: skip isr register and config for disabled displays
There's no need to register the vsync ISR and configure the hardware if
the overlay manager is disabled, so this patch adds a check for disabled
managers to the omap_dss_mgr_apply() function.
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c index 0da8081..7919ff3 100644 --- a/drivers/video/omap2/dss/apply.c +++ b/drivers/video/omap2/dss/apply.c @@ -629,7 +629,7 @@ int omap_dss_mgr_apply(struct omap_overlay_manager *mgr) } r = 0; - if (!mgr_manual_update(mgr)) { + if (mgr->enabled && !mgr_manual_update(mgr)) { if (!dss_cache.irq_enabled) { u32 mask; |