Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 294212
b: refs/heads/master
c: 2c0fad8
h: refs/heads/master
v: v3
  • Loading branch information
Florian Tobias Schandinat authored and Florian Tobias Schandinat committed Mar 6, 2012
1 parent fd32c49 commit 50c0930
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 664c5f18490f2552900c3f1794602204a43acc86
refs/heads/master: 2c0fad8e907abf059b21bdb24d183dcbf8d14c10
2 changes: 1 addition & 1 deletion trunk/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 trunk/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 50c0930

Please sign in to comment.