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

Commit 80d81d64 authored by Archit Taneja's avatar Archit Taneja Committed by Tomi Valkeinen
Browse files

OMAPDSS: OVERLAY/MANAGER: Get device via output 



A manager is not connected to a device directly any more. It first connects
to an output, and then to the display. Update overlay and manager get_device ops
to return the device via the connected output.

Signed-off-by: default avatarArchit Taneja <archit@ti.com>
parent 947b2254

drivers/video/omap2/dss/manager.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static struct omap_overlay_manager *managers; 


static inline struct omap_dss_device *dss_mgr_get_device(struct omap_overlay_manager *mgr)

{

	return mgr->device;

	return mgr->output ? mgr->output->device : NULL;

}



static int dss_mgr_wait_for_vsync(struct omap_overlay_manager *mgr)

drivers/video/omap2/dss/overlay.c

+3 −1
Original line number Diff line number Diff line
@@ -40,7 +40,9 @@ static struct omap_overlay *overlays; 


static inline struct omap_dss_device *dss_ovl_get_device(struct omap_overlay *ovl)

{

	return ovl->manager ? ovl->manager->device : NULL;

	return ovl->manager ?

		(ovl->manager->output ? ovl->manager->output->device : NULL) :

		NULL;

}



int omap_dss_get_num_overlays(void)