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

Commit 952cbaaa authored by Archit Taneja's avatar Archit Taneja Committed by Tomi Valkeinen
Browse files

OMAPFB: Change dssdev->manager references 



To retrieve the manager pointer via a device, we need to now access it via the
output to which the device is connected. Make this change in omapfb_ioctl()
where the WAITFORVSYNC ioctl tries to access the manager's device.

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

drivers/video/omap2/omapfb/omapfb-ioctl.c

+5 −2
Original line number Diff line number Diff line
@@ -599,6 +599,7 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg) 
	struct omapfb_info *ofbi = FB2OFB(fbi);

	struct omapfb2_device *fbdev = ofbi->fbdev;

	struct omap_dss_device *display = fb2display(fbi);

	struct omap_overlay_manager *mgr;



	union {

		struct omapfb_update_window_old	uwnd_o;
@@ -786,12 +787,14 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg) 


	case OMAPFB_WAITFORVSYNC:

		DBG("ioctl WAITFORVSYNC\n");

		if (!display) {

		if (!display && !display->output && !display->output->manager) {

			r = -EINVAL;

			break;

		}



		r = display->manager->wait_for_vsync(display->manager);

		mgr = display->output->manager;



		r = mgr->wait_for_vsync(mgr);

		break;



	case OMAPFB_WAITFORGO: