OMAPDSS: DISPC: rename dispc_mgr_enable/disable to _sync

The current dispc_mgr_enable/disable function are blocking, and do a bit
too much for omapdrm. We'll expose new enable & disable functions that
will just set the bits in the registers in the following patches.

This patch renames the current functions to *_sync, to make it clear
that they are blocking, and also to free up the dispc_mgr_enable/disable
names for these new functions.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c
index 7a61a2f7765dc7f99d23581c07cc542da07143f2..6a214439762ea63353f3a23c2ac63d3d096250b1 100644 (file)
--- a/drivers/video/omap2/dss/apply.c
+++ b/drivers/video/omap2/dss/apply.c
@@ -772,7 +772,7 @@ void dss_mgr_start_update(struct omap_overlay_manager *mgr)
        if (!dss_data.irq_enabled && need_isr())
                dss_register_vsync_isr();
 
-       dispc_mgr_enable(mgr->id);
+       dispc_mgr_enable_sync(mgr->id);
 
        mgr_clear_shadow_dirty(mgr);
 
@@ -1027,7 +1027,7 @@ int dss_mgr_enable(struct omap_overlay_manager *mgr)
        spin_unlock_irqrestore(&data_lock, flags);
 
        if (!mgr_manual_update(mgr))
-               dispc_mgr_enable(mgr->id);
+               dispc_mgr_enable_sync(mgr->id);
 
 out:
        mutex_unlock(&apply_lock);
@@ -1052,7 +1052,7 @@ void dss_mgr_disable(struct omap_overlay_manager *mgr)
                goto out;
 
        if (!mgr_manual_update(mgr))
-               dispc_mgr_disable(mgr->id);
+               dispc_mgr_disable_sync(mgr->id);
 
        spin_lock_irqsave(&data_lock, flags);
 

diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 392445aa2daf73b4674ae5d26e7edffd40689e9a..600a4121c6d5e3c9e9e1bb01ffb7627bf65e0266 100644 (file)
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -2755,7 +2755,7 @@ static void dispc_mgr_disable_digit_out(void)
                DSSERR("failed to unregister %x isr\n", irq_mask);
 }
 
-void dispc_mgr_enable(enum omap_channel channel)
+void dispc_mgr_enable_sync(enum omap_channel channel)
 {
        if (dss_mgr_is_lcd(channel))
                dispc_mgr_enable_lcd_out(channel);
@@ -2765,7 +2765,7 @@ void dispc_mgr_enable(enum omap_channel channel)
                WARN_ON(1);
 }
 
-void dispc_mgr_disable(enum omap_channel channel)
+void dispc_mgr_disable_sync(enum omap_channel channel)
 {
        if (dss_mgr_is_lcd(channel))
                dispc_mgr_disable_lcd_out(channel);

diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index d468743a209edfe641a9f535bbd50e6de82648cf..687eddfc2eb34e573d45a0c69197a14bbb541081 100644 (file)
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -436,8 +436,8 @@ u32 dispc_mgr_get_sync_lost_irq(enum omap_channel channel);
 bool dispc_mgr_go_busy(enum omap_channel channel);
 void dispc_mgr_go(enum omap_channel channel);
 bool dispc_mgr_is_enabled(enum omap_channel channel);
-void dispc_mgr_enable(enum omap_channel channel);
-void dispc_mgr_disable(enum omap_channel channel);
+void dispc_mgr_enable_sync(enum omap_channel channel);
+void dispc_mgr_disable_sync(enum omap_channel channel);
 bool dispc_mgr_is_channel_enabled(enum omap_channel channel);
 void dispc_mgr_set_lcd_config(enum omap_channel channel,
                const struct dss_lcd_mgr_config *config);