Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a979f8a authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

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: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 392faa0e

drivers/video/omap2/dss/apply.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

drivers/video/omap2/dss/dispc.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/video/omap2/dss/dss.h

+2 −2
Original line number Diff line number Diff line
@@ -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);