diff options
| author | Archit Taneja <archit@ti.com> | 2012-09-10 14:43:39 +0530 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-26 14:58:37 +0300 |
| commit | 952cbaaa9b8beacc425f9aedf370468cbb737a2c (patch) | |
| tree | db7b3a2ff26090d5324e566b94415d3ad4bd7269 /drivers/video | |
| parent | cea87b92da825f24efd11112d414f6c8cdd4ced8 (diff) | |
| download | talos-obmc-linux-952cbaaa9b8beacc425f9aedf370468cbb737a2c.tar.gz talos-obmc-linux-952cbaaa9b8beacc425f9aedf370468cbb737a2c.zip | |
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: Archit Taneja <archit@ti.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/omap2/omapfb/omapfb-ioctl.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c index c6cf372d22c5..606b89f12351 100644 --- a/drivers/video/omap2/omapfb/omapfb-ioctl.c +++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c @@ -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: |
