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

Commit 85099f11 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

Revert "OMAPDSS: APPLY: add fifo merge support funcs" 



This reverts commit fb011974.

Adding fifo merge feature as an omapdss internal configuration was a
mistake. We cannot hide from the users of omapdss the complexities of
fifo merge.

The previous commit removed fifo merge itself, and this removes the
remaining fifo merge support functions.

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

drivers/video/omap2/dss/apply.c

+0 −43
Original line number Diff line number Diff line
@@ -111,9 +111,6 @@ static struct { 
	struct ovl_priv_data ovl_priv_data_array[MAX_DSS_OVERLAYS];

	struct mgr_priv_data mgr_priv_data_array[MAX_DSS_MANAGERS];



	bool fifo_merge_dirty;

	bool fifo_merge;



	bool irq_enabled;

} dss_data;
@@ -677,40 +674,11 @@ static void dss_mgr_write_regs_extra(struct omap_overlay_manager *mgr) 
		mp->shadow_extra_info_dirty = true;

}



static void dss_write_regs_common(void)

{

	const int num_mgrs = omap_dss_get_num_overlay_managers();

	int i;



	if (!dss_data.fifo_merge_dirty)

		return;



	for (i = 0; i < num_mgrs; ++i) {

		struct omap_overlay_manager *mgr;

		struct mgr_priv_data *mp;



		mgr = omap_dss_get_overlay_manager(i);

		mp = get_mgr_priv(mgr);



		if (mp->enabled) {

			if (dss_data.fifo_merge_dirty) {

				dispc_enable_fifomerge(dss_data.fifo_merge);

				dss_data.fifo_merge_dirty = false;

			}



			if (mp->updating)

				mp->shadow_info_dirty = true;

		}

	}

}



static void dss_write_regs(void)

{

	const int num_mgrs = omap_dss_get_num_overlay_managers();

	int i;



	dss_write_regs_common();



	for (i = 0; i < num_mgrs; ++i) {

		struct omap_overlay_manager *mgr;

		struct mgr_priv_data *mp;
@@ -799,8 +767,6 @@ void dss_mgr_start_update(struct omap_overlay_manager *mgr) 
	dss_mgr_write_regs(mgr);

	dss_mgr_write_regs_extra(mgr);



	dss_write_regs_common();



	mp->updating = true;



	if (!dss_data.irq_enabled && need_isr())
@@ -984,15 +950,6 @@ static void dss_apply_ovl_fifo_thresholds(struct omap_overlay *ovl, 
	op->extra_info_dirty = true;

}



static void dss_apply_fifo_merge(bool use_fifo_merge)

{

	if (dss_data.fifo_merge == use_fifo_merge)

		return;



	dss_data.fifo_merge = use_fifo_merge;

	dss_data.fifo_merge_dirty = true;

}



static void dss_ovl_setup_fifo(struct omap_overlay *ovl)

{

	struct ovl_priv_data *op = get_ovl_priv(ovl);