Skip to content

Commit

Permalink
Merge branch 'fbdev-for-linus' into fbdev-next
Browse files Browse the repository at this point in the history
  • Loading branch information
Florian Tobias Schandinat authored and Florian Tobias Schandinat committed Feb 29, 2012
2 parents 327e276 + a3d0e4a commit 0d04c58
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/video/omap2/displays/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ config PANEL_GENERIC_DPI

config PANEL_DVI
tristate "DVI output"
depends on OMAP2_DSS_DPI
depends on OMAP2_DSS_DPI && I2C
help
Driver for external monitors, connected via DVI. The driver uses i2c
to read EDID information from the monitor.
Expand Down
6 changes: 6 additions & 0 deletions drivers/video/omap2/dss/apply.c
Original file line number Diff line number Diff line change
Expand Up @@ -1276,6 +1276,9 @@ int dss_ovl_enable(struct omap_overlay *ovl)

spin_unlock_irqrestore(&data_lock, flags);

/* wait for overlay to be enabled */
wait_pending_extra_info_updates();

mutex_unlock(&apply_lock);

return 0;
Expand Down Expand Up @@ -1313,6 +1316,9 @@ int dss_ovl_disable(struct omap_overlay *ovl)

spin_unlock_irqrestore(&data_lock, flags);

/* wait for the overlay to be disabled */
wait_pending_extra_info_updates();

mutex_unlock(&apply_lock);

return 0;
Expand Down

0 comments on commit 0d04c58

Please sign in to comment.