Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d04c58a authored by Florian Tobias Schandinat's avatar Florian Tobias Schandinat
Browse files

Merge branch 'fbdev-for-linus' into fbdev-next

parents 327e2768 a3d0e4ae

drivers/video/omap2/displays/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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.

drivers/video/omap2/dss/apply.c

+6 −0
Original line number Diff line number Diff line
@@ -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;