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

Commit aba96570 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: clean up dss_mgr_set_lcd_config 



dss_mgr_set_lcd_config() can only be called when the output is not
active. This means that most of the code in the function is extra, as
there's no need to write the values to registers, etc, because that will
be handled when the output will be enabled.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent f6a0492e

drivers/video/omap2/dss/apply.c

+2 −12
Original line number Original line Diff line number Diff line
@@ -1346,7 +1346,7 @@ void dss_mgr_set_lcd_config(struct omap_overlay_manager *mgr, 
	unsigned long flags;

	unsigned long flags;

	struct mgr_priv_data *mp = get_mgr_priv(mgr);

	struct mgr_priv_data *mp = get_mgr_priv(mgr);





	mutex_lock(&apply_lock);

	spin_lock_irqsave(&data_lock, flags);





	if (mp->enabled) {

	if (mp->enabled) {

		DSSERR("cannot apply lcd config for %s: manager needs to be disabled\n",

		DSSERR("cannot apply lcd config for %s: manager needs to be disabled\n",
@@ -1354,19 +1354,9 @@ void dss_mgr_set_lcd_config(struct omap_overlay_manager *mgr, 
		goto out;

		goto out;

	}

	}





	spin_lock_irqsave(&data_lock, flags);



	dss_apply_mgr_lcd_config(mgr, config);

	dss_apply_mgr_lcd_config(mgr, config);



	dss_write_regs();

	dss_set_go_bits();



	spin_unlock_irqrestore(&data_lock, flags);



	wait_pending_extra_info_updates();



out:

out:

	mutex_unlock(&apply_lock);

	spin_unlock_irqrestore(&data_lock, flags);

}

}





int dss_ovl_set_info(struct omap_overlay *ovl,

int dss_ovl_set_info(struct omap_overlay *ovl,