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

Commit bcd8e374 authored by Jani Nikula's avatar Jani Nikula Committed by Tomi Valkeinen
Browse files

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: default avatarJani Nikula <ext-jani.1.nikula@nokia.com>
[tomi.valkeinen@ti.com: improved description]
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 91ac27a6

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

+0 −13
Original line number Diff line number Diff line
@@ -1271,7 +1271,6 @@ static int omapfb_blank(int blank, struct fb_info *fbi) 
	struct omapfb_info *ofbi = FB2OFB(fbi);

	struct omapfb2_device *fbdev = ofbi->fbdev;

	struct omap_dss_device *display = fb2display(fbi);

	int do_update = 0;

	int r = 0;



	if (!display)
@@ -1287,11 +1286,6 @@ static int omapfb_blank(int blank, struct fb_info *fbi) 
		if (display->driver->resume)

			r = display->driver->resume(display);



		if (r == 0 && display->driver->get_update_mode &&

				display->driver->get_update_mode(display) ==

				OMAP_DSS_UPDATE_MANUAL)

			do_update = 1;



		break;



	case FB_BLANK_NORMAL:
@@ -1315,13 +1309,6 @@ static int omapfb_blank(int blank, struct fb_info *fbi) 
exit:

	omapfb_unlock(fbdev);



	if (r == 0 && do_update && display->driver->update) {

		u16 w, h;

		display->driver->get_resolution(display, &w, &h);



		r = display->driver->update(display, 0, 0, w, h);

	}



	return r;

}