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

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
...@@ -599,6 +599,7 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg) ...@@ -599,6 +599,7 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
struct omapfb_info *ofbi = FB2OFB(fbi); struct omapfb_info *ofbi = FB2OFB(fbi);
struct omapfb2_device *fbdev = ofbi->fbdev; struct omapfb2_device *fbdev = ofbi->fbdev;
struct omap_dss_device *display = fb2display(fbi); struct omap_dss_device *display = fb2display(fbi);
struct omap_overlay_manager *mgr;
union { union {
struct omapfb_update_window_old uwnd_o; struct omapfb_update_window_old uwnd_o;
...@@ -786,12 +787,14 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg) ...@@ -786,12 +787,14 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
case OMAPFB_WAITFORVSYNC: case OMAPFB_WAITFORVSYNC:
DBG("ioctl WAITFORVSYNC\n"); DBG("ioctl WAITFORVSYNC\n");
if (!display) { if (!display && !display->output && !display->output->manager) {
r = -EINVAL; r = -EINVAL;
break; break;
} }
r = display->manager->wait_for_vsync(display->manager); mgr = display->output->manager;
r = mgr->wait_for_vsync(mgr);
break; break;
case OMAPFB_WAITFORGO: case OMAPFB_WAITFORGO:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment