فهرست منبع

OMAP: DSS2: OMAPFB: Remove FB_OMAP2_FORCE_AUTO_UPDATE

Remove the option for forcing auto-update. Auto-update for manual update
displays is no more a DSS feature, so if a particular display devices does
have auto-update mode, it should be in display's custom settings.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Tomi Valkeinen 15 سال پیش
والد
کامیت
ddbfeb396e
2فایلهای تغییر یافته به همراه3 افزوده شده و 23 حذف شده
  1. 0 9
      drivers/video/omap2/omapfb/Kconfig
  2. 3 14
      drivers/video/omap2/omapfb/omapfb-main.c

+ 0 - 9
drivers/video/omap2/omapfb/Kconfig

@@ -18,15 +18,6 @@ config FB_OMAP2_DEBUG_SUPPORT
 	  Support for debug output. You have to enable the actual printing
 	  Support for debug output. You have to enable the actual printing
 	  with 'debug' module parameter.
 	  with 'debug' module parameter.
 
 
-config FB_OMAP2_FORCE_AUTO_UPDATE
-	bool "Force main display to automatic update mode"
-	depends on FB_OMAP2
-	help
-	  Forces main display to automatic update mode (if possible),
-	  and also enables tearsync (if possible). By default
-	  displays that support manual update are started in manual
-	  update mode.
-
 config FB_OMAP2_NUM_FBS
 config FB_OMAP2_NUM_FBS
 	int "Number of framebuffers"
 	int "Number of framebuffers"
 	range 1 10
 	range 1 10

+ 3 - 14
drivers/video/omap2/omapfb/omapfb-main.c

@@ -2194,9 +2194,7 @@ static int omapfb_probe(struct platform_device *pdev)
 
 
 	if (def_display) {
 	if (def_display) {
 		struct omap_dss_driver *dssdrv = def_display->driver;
 		struct omap_dss_driver *dssdrv = def_display->driver;
-#ifndef CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE
-		u16 w, h;
-#endif
+
 		r = def_display->driver->enable(def_display);
 		r = def_display->driver->enable(def_display);
 		if (r) {
 		if (r) {
 			dev_warn(fbdev->dev, "Failed to enable display '%s'\n",
 			dev_warn(fbdev->dev, "Failed to enable display '%s'\n",
@@ -2204,25 +2202,16 @@ static int omapfb_probe(struct platform_device *pdev)
 			goto cleanup;
 			goto cleanup;
 		}
 		}
 
 
-		/* set the update mode */
 		if (def_display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
 		if (def_display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
-#ifdef CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE
+			u16 w, h;
 			if (dssdrv->enable_te)
 			if (dssdrv->enable_te)
 				dssdrv->enable_te(def_display, 1);
 				dssdrv->enable_te(def_display, 1);
-			if (dssdrv->set_update_mode)
-				dssdrv->set_update_mode(def_display,
-						OMAP_DSS_UPDATE_AUTO);
-#else /* MANUAL_UPDATE */
-			if (dssdrv->enable_te)
-				dssdrv->enable_te(def_display, 0);
 			if (dssdrv->set_update_mode)
 			if (dssdrv->set_update_mode)
 				dssdrv->set_update_mode(def_display,
 				dssdrv->set_update_mode(def_display,
 						OMAP_DSS_UPDATE_MANUAL);
 						OMAP_DSS_UPDATE_MANUAL);
 
 
-			dssdrv->get_resolution(def_display,
-					&w, &h);
+			dssdrv->get_resolution(def_display, &w, &h);
 			def_display->driver->update(def_display, 0, 0, w, h);
 			def_display->driver->update(def_display, 0, 0, w, h);
-#endif
 		} else {
 		} else {
 			if (dssdrv->set_update_mode)
 			if (dssdrv->set_update_mode)
 				dssdrv->set_update_mode(def_display,
 				dssdrv->set_update_mode(def_display,