---

yaml
---
r: 184879
b: refs/heads/master
c: ddbfeb3
h: refs/heads/master
i:
  184877: a7b6413
  184875: 218e5d6
  184871: 5e2b862
  184863: 5576538
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 942a91a6e04e996c32252bc6c2177f74089d7a1d
+refs/heads/master: ddbfeb396eb085e17f5aa830a151d546f16cb868

trunk/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
 	  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
 	int "Number of framebuffers"
 	range 1 10

trunk/drivers/video/omap2/omapfb/omapfb-main.c

@@ -2194,35 +2194,24 @@ static int omapfb_probe(struct platform_device *pdev)
 
 	if (def_display) {
 		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);
 		if (r) {
 			dev_warn(fbdev->dev, "Failed to enable display '%s'\n",
 					def_display->name);
 			goto cleanup;
 		}
 
-		/* set the update mode */
 		if (def_display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
-#ifdef CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE
+			u16 w, h;
 			if (dssdrv->enable_te)
 				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)
 				dssdrv->set_update_mode(def_display,
 						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);
-#endif
 		} else {
 			if (dssdrv->set_update_mode)
 				dssdrv->set_update_mode(def_display,