Skip to content

Commit

Permalink
OMAPFB: Change dssdev->manager references
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Archit Taneja authored and Tomi Valkeinen committed Sep 26, 2012
1 parent cea87b9 commit 952cbaa
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/video/omap2/omapfb/omapfb-ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 952cbaa

Please sign in to comment.