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

Commit 1cb00178 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: pass ovl manager to dss_start_update 



dss_start_update() takes currently the dss device as a parameter. Change
the parameter to ovl manager, as that is what the dss_start_update()
actually needs. Change the name of the function to
dss_mgr_start_update() to reflect the change.

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

drivers/video/omap2/dss/dsi.c

+1 −1
Original line number Diff line number Diff line
@@ -4097,7 +4097,7 @@ static void dsi_update_screen_dispc(struct omap_dss_device *dssdev, 
		msecs_to_jiffies(250));

	BUG_ON(r == 0);



	dss_start_update(dssdev);

	dss_mgr_start_update(dssdev->manager);



	if (dsi->te_enabled) {

		/* disable LP_RX_TO, so that we can receive TE.  Time to wait

drivers/video/omap2/dss/dss.h

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ void default_get_overlay_fifo_thresholds(enum omap_plane plane, 
int dss_init_overlay_managers(struct platform_device *pdev);

void dss_uninit_overlay_managers(struct platform_device *pdev);

int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl);

void dss_start_update(struct omap_dss_device *dssdev);

void dss_mgr_start_update(struct omap_overlay_manager *mgr);



/* overlay */

void dss_init_overlays(struct platform_device *pdev);

drivers/video/omap2/dss/manager.c

+2 −5
Original line number Diff line number Diff line
@@ -896,17 +896,14 @@ static int configure_dispc(void) 
	return r;

}



void dss_start_update(struct omap_dss_device *dssdev)

void dss_mgr_start_update(struct omap_overlay_manager *mgr)

{

	struct manager_cache_data *mc;

	struct overlay_cache_data *oc;

	const int num_ovls = dss_feat_get_num_ovls();

	const int num_mgrs = dss_feat_get_num_mgrs();

	struct omap_overlay_manager *mgr;

	int i;



	mgr = dssdev->manager;



	mc = &dss_cache.manager_cache[mgr->id];



	mc->do_manual_update = true;
@@ -929,7 +926,7 @@ void dss_start_update(struct omap_dss_device *dssdev) 
		mc->shadow_dirty = false;

	}



	dssdev->manager->enable(dssdev->manager);

	mgr->enable(mgr);

}



static void dss_apply_irq_handler(void *data, u32 mask)