Merge omapzoom-changes into drivers/video/omap2/dss/dispc.c

This merges omapzoom-changes which were lost during the merge of
the motorola-patch back into dispc.c and fixes the panel not
resuming on rare occasions.

Change-Id: If70e11c8a39e5dab4a91af3bbc9e209deeac0348