summaryrefslogtreecommitdiff
path: root/drivers/video/omap2/omapfb/omapfb-main.c
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2012-09-11 15:34:08 +0530
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-09-11 13:51:28 +0300
commitfda7c362f9ef59de6d6db67a854e1a114af0c69a (patch)
tree32cc1c52964dc92deaa7f19ba74facb695f4f57c /drivers/video/omap2/omapfb/omapfb-main.c
parent6659145746bcf01ac650c76e5736c5003c2db230 (diff)
downloadlwn-fda7c362f9ef59de6d6db67a854e1a114af0c69a.tar.gz
lwn-fda7c362f9ef59de6d6db67a854e1a114af0c69a.zip
OMAPFB: Clear framebuffers before they are registered
The framebuffers are cleared with the function omapfb_clear_fb(), which internally calls cfb_fillrect(). The boot logo is copied on to the framebuffer when the fb device is registered with fb framework. omapfb_clear_fb() is called after the framebuffer is registered, leading to the boot logo getting cleared. Clear the framebuffers using omapfb_clear_fb() before registering the framebuffer devices. Signed-off-by: Archit Taneja <archit@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/omapfb/omapfb-main.c')
-rw-r--r--drivers/video/omap2/omapfb/omapfb-main.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 7afdfcf3bac8..77ae9edbf2cd 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -1961,6 +1961,16 @@ static int omapfb_create_framebuffers(struct omapfb2_device *fbdev)
}
}
+ for (i = 0; i < fbdev->num_fbs; i++) {
+ struct fb_info *fbi = fbdev->fbs[i];
+ struct omapfb_info *ofbi = FB2OFB(fbi);
+
+ if (ofbi->region->size == 0)
+ continue;
+
+ omapfb_clear_fb(fbi);
+ }
+
DBG("fb_infos initialized\n");
for (i = 0; i < fbdev->num_fbs; i++) {
@@ -1988,16 +1998,6 @@ static int omapfb_create_framebuffers(struct omapfb2_device *fbdev)
}
}
- for (i = 0; i < fbdev->num_fbs; i++) {
- struct fb_info *fbi = fbdev->fbs[i];
- struct omapfb_info *ofbi = FB2OFB(fbi);
-
- if (ofbi->region->size == 0)
- continue;
-
- omapfb_clear_fb(fbi);
- }
-
/* Enable fb0 */
if (fbdev->num_fbs > 0) {
struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[0]);