Skip to content

Commit

Permalink
Revert "omapfb-ioctl: Ignore state of display when enabling/disabling…
Browse files Browse the repository at this point in the history
… vsync"

This reverts commit d1438db, since
the condition has been fixed in userspace. Reverting this resolves
frequent crashes induced by the HDMI output being disconnected
  • Loading branch information
rmcc committed Jan 13, 2013
1 parent b2f4466 commit afbde80
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/video/omap2/omapfb/omapfb-ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -920,14 +920,14 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
omapfb_lock(fbdev);
fbdev->vsync_active = !!p.crt;

//if (display->state == OMAP_DSS_DISPLAY_ACTIVE) {
if (display->state == OMAP_DSS_DISPLAY_ACTIVE) {
if (p.crt)
omapfb_enable_vsync(fbdev, display->channel,
true);
else
omapfb_enable_vsync(fbdev, display->channel,
false);
//}
}
omapfb_unlock(fbdev);
break;

Expand Down

0 comments on commit afbde80

Please sign in to comment.