diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-02-29 22:42:55 +0000 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-02-29 22:42:55 +0000 |
| commit | 0d04c58aa41652f2adc369926bd944cbeb7ba5a2 (patch) | |
| tree | b4dab6b4f4a45c8ead14d36bc0872d5ca3c25cb3 | |
| parent | 327e27681c27d3ed5ea470ec483904d1a318cb7f (diff) | |
| parent | a3d0e4aecaa32001e02d5ce860d38f14095d06d2 (diff) | |
Merge branch 'fbdev-for-linus' into fbdev-next
| -rw-r--r-- | drivers/video/omap2/displays/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/apply.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/video/omap2/displays/Kconfig b/drivers/video/omap2/displays/Kconfig index 74d29b55290..408a9927be9 100644 --- a/drivers/video/omap2/displays/Kconfig +++ b/drivers/video/omap2/displays/Kconfig @@ -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. diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c index 052dc874cd3..87b3e25294c 100644 --- a/drivers/video/omap2/dss/apply.c +++ b/drivers/video/omap2/dss/apply.c @@ -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; @@ -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; |