aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2
diff options
context:
space:
mode:
authorJani Nikula <ext-jani.1.nikula@nokia.com>2010-09-24 05:16:24 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-05-11 07:19:25 -0400
commitbcd8e374b5d39d481d00936e183b0ded99a5f31a (patch)
tree1df0b552c6704eb35964eceb707cc2b409007d50 /drivers/video/omap2
parent91ac27a6879df3865e160adf979960a14f17d1aa (diff)
OMAP: DSS2: OMAPFB: Remove implicit display update on unblank
Currently omapfb does an implicit display update (for manual update displays) on unblank. There is no guarantee that the framebuffer contains a valid image when unblank is called. When using manual update displays it is the responsibility of the user space to update the display, and so it should be in this case also. This patch removes the implicit display update on unblank. Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com> [tomi.valkeinen@ti.com: improved description] Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2')
-rw-r--r--drivers/video/omap2/omapfb/omapfb-main.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 60a0eb793422..eba90b34579f 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -1271,7 +1271,6 @@ static int omapfb_blank(int blank, struct fb_info *fbi)
1271 struct omapfb_info *ofbi = FB2OFB(fbi); 1271 struct omapfb_info *ofbi = FB2OFB(fbi);
1272 struct omapfb2_device *fbdev = ofbi->fbdev; 1272 struct omapfb2_device *fbdev = ofbi->fbdev;
1273 struct omap_dss_device *display = fb2display(fbi); 1273 struct omap_dss_device *display = fb2display(fbi);
1274 int do_update = 0;
1275 int r = 0; 1274 int r = 0;
1276 1275
1277 if (!display) 1276 if (!display)
@@ -1287,11 +1286,6 @@ static int omapfb_blank(int blank, struct fb_info *fbi)
1287 if (display->driver->resume) 1286 if (display->driver->resume)
1288 r = display->driver->resume(display); 1287 r = display->driver->resume(display);
1289 1288
1290 if (r == 0 && display->driver->get_update_mode &&
1291 display->driver->get_update_mode(display) ==
1292 OMAP_DSS_UPDATE_MANUAL)
1293 do_update = 1;
1294
1295 break; 1289 break;
1296 1290
1297 case FB_BLANK_NORMAL: 1291 case FB_BLANK_NORMAL:
@@ -1315,13 +1309,6 @@ static int omapfb_blank(int blank, struct fb_info *fbi)
1315exit: 1309exit:
1316 omapfb_unlock(fbdev); 1310 omapfb_unlock(fbdev);
1317 1311
1318 if (r == 0 && do_update && display->driver->update) {
1319 u16 w, h;
1320 display->driver->get_resolution(display, &w, &h);
1321
1322 r = display->driver->update(display, 0, 0, w, h);
1323 }
1324
1325 return r; 1312 return r;
1326} 1313}
1327 1314