diff options
author | Archit Taneja <archit@ti.com> | 2012-09-11 06:04:08 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-11 06:51:28 -0400 |
commit | fda7c362f9ef59de6d6db67a854e1a114af0c69a (patch) | |
tree | 32cc1c52964dc92deaa7f19ba74facb695f4f57c | |
parent | 6659145746bcf01ac650c76e5736c5003c2db230 (diff) |
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>
-rw-r--r-- | drivers/video/omap2/omapfb/omapfb-main.c | 20 |
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 7afdfcf3bac..77ae9edbf2c 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) | |||
1961 | } | 1961 | } |
1962 | } | 1962 | } |
1963 | 1963 | ||
1964 | for (i = 0; i < fbdev->num_fbs; i++) { | ||
1965 | struct fb_info *fbi = fbdev->fbs[i]; | ||
1966 | struct omapfb_info *ofbi = FB2OFB(fbi); | ||
1967 | |||
1968 | if (ofbi->region->size == 0) | ||
1969 | continue; | ||
1970 | |||
1971 | omapfb_clear_fb(fbi); | ||
1972 | } | ||
1973 | |||
1964 | DBG("fb_infos initialized\n"); | 1974 | DBG("fb_infos initialized\n"); |
1965 | 1975 | ||
1966 | for (i = 0; i < fbdev->num_fbs; i++) { | 1976 | for (i = 0; i < fbdev->num_fbs; i++) { |
@@ -1988,16 +1998,6 @@ static int omapfb_create_framebuffers(struct omapfb2_device *fbdev) | |||
1988 | } | 1998 | } |
1989 | } | 1999 | } |
1990 | 2000 | ||
1991 | for (i = 0; i < fbdev->num_fbs; i++) { | ||
1992 | struct fb_info *fbi = fbdev->fbs[i]; | ||
1993 | struct omapfb_info *ofbi = FB2OFB(fbi); | ||
1994 | |||
1995 | if (ofbi->region->size == 0) | ||
1996 | continue; | ||
1997 | |||
1998 | omapfb_clear_fb(fbi); | ||
1999 | } | ||
2000 | |||
2001 | /* Enable fb0 */ | 2001 | /* Enable fb0 */ |
2002 | if (fbdev->num_fbs > 0) { | 2002 | if (fbdev->num_fbs > 0) { |
2003 | struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[0]); | 2003 | struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[0]); |