aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@nokia.com>2010-02-17 08:01:50 -0500
committerTomi Valkeinen <tomi.valkeinen@nokia.com>2010-02-24 07:31:28 -0500
commitddbfeb396eb085e17f5aa830a151d546f16cb868 (patch)
treed39040e33d3f6d944ad53a92844446ca398e494c /drivers/video
parent942a91a6e04e996c32252bc6c2177f74089d7a1d (diff)
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>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap2/omapfb/Kconfig9
-rw-r--r--drivers/video/omap2/omapfb/omapfb-main.c17
2 files changed, 3 insertions, 23 deletions
diff --git a/drivers/video/omap2/omapfb/Kconfig b/drivers/video/omap2/omapfb/Kconfig
index 5effa1d4d0e6..43496d6c377f 100644
--- a/drivers/video/omap2/omapfb/Kconfig
+++ b/drivers/video/omap2/omapfb/Kconfig
@@ -18,15 +18,6 @@ config FB_OMAP2_DEBUG_SUPPORT
18 Support for debug output. You have to enable the actual printing 18 Support for debug output. You have to enable the actual printing
19 with 'debug' module parameter. 19 with 'debug' module parameter.
20 20
21config FB_OMAP2_FORCE_AUTO_UPDATE
22 bool "Force main display to automatic update mode"
23 depends on FB_OMAP2
24 help
25 Forces main display to automatic update mode (if possible),
26 and also enables tearsync (if possible). By default
27 displays that support manual update are started in manual
28 update mode.
29
30config FB_OMAP2_NUM_FBS 21config FB_OMAP2_NUM_FBS
31 int "Number of framebuffers" 22 int "Number of framebuffers"
32 range 1 10 23 range 1 10
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 8aed12a1ce2f..e3a1730df5fd 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2194,9 +2194,7 @@ static int omapfb_probe(struct platform_device *pdev)
2194 2194
2195 if (def_display) { 2195 if (def_display) {
2196 struct omap_dss_driver *dssdrv = def_display->driver; 2196 struct omap_dss_driver *dssdrv = def_display->driver;
2197#ifndef CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE 2197
2198 u16 w, h;
2199#endif
2200 r = def_display->driver->enable(def_display); 2198 r = def_display->driver->enable(def_display);
2201 if (r) { 2199 if (r) {
2202 dev_warn(fbdev->dev, "Failed to enable display '%s'\n", 2200 dev_warn(fbdev->dev, "Failed to enable display '%s'\n",
@@ -2204,25 +2202,16 @@ static int omapfb_probe(struct platform_device *pdev)
2204 goto cleanup; 2202 goto cleanup;
2205 } 2203 }
2206 2204
2207 /* set the update mode */
2208 if (def_display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) { 2205 if (def_display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
2209#ifdef CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE 2206 u16 w, h;
2210 if (dssdrv->enable_te) 2207 if (dssdrv->enable_te)
2211 dssdrv->enable_te(def_display, 1); 2208 dssdrv->enable_te(def_display, 1);
2212 if (dssdrv->set_update_mode) 2209 if (dssdrv->set_update_mode)
2213 dssdrv->set_update_mode(def_display, 2210 dssdrv->set_update_mode(def_display,
2214 OMAP_DSS_UPDATE_AUTO);
2215#else /* MANUAL_UPDATE */
2216 if (dssdrv->enable_te)
2217 dssdrv->enable_te(def_display, 0);
2218 if (dssdrv->set_update_mode)
2219 dssdrv->set_update_mode(def_display,
2220 OMAP_DSS_UPDATE_MANUAL); 2211 OMAP_DSS_UPDATE_MANUAL);
2221 2212
2222 dssdrv->get_resolution(def_display, 2213 dssdrv->get_resolution(def_display, &w, &h);
2223 &w, &h);
2224 def_display->driver->update(def_display, 0, 0, w, h); 2214 def_display->driver->update(def_display, 0, 0, w, h);
2225#endif
2226 } else { 2215 } else {
2227 if (dssdrv->set_update_mode) 2216 if (dssdrv->set_update_mode)
2228 dssdrv->set_update_mode(def_display, 2217 dssdrv->set_update_mode(def_display,