diff options
| author | Jong Kim <jongk@nvidia.com> | 2013-07-01 13:40:32 -0700 |
|---|---|---|
| committer | Matthew Pedro <mapedro@nvidia.com> | 2013-07-11 05:03:26 -0700 |
| commit | 439d56a1b2b266d127e021e037be8e30c89f33fb (patch) | |
| tree | f7bf86c6021bd8255afb1b606ceb87e19e5c4ff8 | |
| parent | 5065f2b7ca2f76f5cf48ceef3f4d09435d30be2e (diff) | |
ARM: tegra: dalmore: clear fb if bl fb not defined.
Clear primary framebuffer if bootloader framebuffer is not defined.
(Some bootloader such as u-boot may not support LCD display and not
supporting LCD in bootloader is purely customer's choice and the
kernel display driver should survive such configuration).
bug 1301464
bug 1264520
Change-Id: Ia37f1f9db08166509bf02673268180f277286dc2
Signed-off-by: Jong Kim <jongk@nvidia.com>
Reviewed-on: http://git-master/r/243977
(cherry picked from commit 6e713daa1b729e341f682568a12bd0ef0249be72)
Reviewed-on: http://git-master/r/247275
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/board-dalmore-panel.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-dalmore-panel.c b/arch/arm/mach-tegra/board-dalmore-panel.c index fccb2d2787d7..c1141b35afd0 100644 --- a/arch/arm/mach-tegra/board-dalmore-panel.c +++ b/arch/arm/mach-tegra/board-dalmore-panel.c @@ -520,9 +520,13 @@ int __init dalmore_panel_init(void) res->end = tegra_fb_start + tegra_fb_size - 1; /* Copy the bootloader fb to the fb. */ - __tegra_move_framebuffer(&dalmore_nvmap_device, - tegra_fb_start, tegra_bootloader_fb_start, - min(tegra_fb_size, tegra_bootloader_fb_size)); + if (tegra_bootloader_fb_size) + __tegra_move_framebuffer(&dalmore_nvmap_device, + tegra_fb_start, tegra_bootloader_fb_start, + min(tegra_fb_size, tegra_bootloader_fb_size)); + else + __tegra_clear_framebuffer(&dalmore_nvmap_device, + tegra_fb_start, tegra_fb_size); dalmore_disp1_device.dev.parent = &phost1x->dev; err = platform_device_register(&dalmore_disp1_device); |