From c1e028a7d3f2c2a5cda48a038053898458e7198c Mon Sep 17 00:00:00 2001 From: Jong Kim Date: Wed, 12 Dec 2012 16:20:22 -0800 Subject: video: tegra: clear fb2 unspecified by bootloader Clear framebuffer2 if and only if framebuffer2 is not specified by the bootloader. If the bootloader framebuffer2 is specified, then copy the contents to kernel framebuffer2. bug 1175957 Change-Id: I4ac4432c1dac6a6c634ab3e6ae31628f9c64ddb4 Signed-off-by: Jong Kim Reviewed-on: http://git-master/r/170663 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Jon Mayo GVS: Gerrit_Virtual_Submit Reviewed-by: Winnie Hsu --- arch/arm/mach-tegra/board-ventana-panel.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'arch/arm/mach-tegra/board-ventana-panel.c') diff --git a/arch/arm/mach-tegra/board-ventana-panel.c b/arch/arm/mach-tegra/board-ventana-panel.c index 56a222432fe0..d2d89392e1c5 100644 --- a/arch/arm/mach-tegra/board-ventana-panel.c +++ b/arch/arm/mach-tegra/board-ventana-panel.c @@ -433,9 +433,16 @@ int __init ventana_panel_init(void) tegra_move_framebuffer(tegra_fb_start, tegra_bootloader_fb_start, min(tegra_fb_size, tegra_bootloader_fb_size)); - /* Copy the bootloader fb to the fb2. */ - tegra_move_framebuffer(tegra_fb2_start, tegra_bootloader_fb_start, - min(tegra_fb2_size, tegra_bootloader_fb_size)); + /* + * If the bootloader fb2 is valid, copy it to the fb2, or else + * clear fb2 to avoid garbage on dispaly2. + */ + if (tegra_bootloader_fb2_size) + tegra_move_framebuffer(tegra_fb2_start, + tegra_bootloader_fb2_start, + min(tegra_fb2_size, tegra_bootloader_fb2_size)); + else + tegra_clear_framebuffer(tegra_fb2_start, tegra_fb2_size); #if defined(CONFIG_TEGRA_GRHOST) && defined(CONFIG_TEGRA_DC) -- cgit v1.2.3