|
@@ -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:
|