aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorPeter Nordström <nordstrom@ti.com>2012-04-23 20:34:12 -0700
committerZiyann <jaraidaniel@gmail.com>2014-11-19 21:05:45 +0100
commit79cb27ca6f37c59019b53179dd93fcd261beff9b (patch)
treed19579ecd533ca7e74fef219d2174bb2f604c8dc /arch/arm/plat-omap
parentd3b2c4825f81fcdc9b3c902688fa75b3e0867f79 (diff)
downloadkernel_samsung_tuna-79cb27ca6f37c59019b53179dd93fcd261beff9b.zip
kernel_samsung_tuna-79cb27ca6f37c59019b53179dd93fcd261beff9b.tar.gz
kernel_samsung_tuna-79cb27ca6f37c59019b53179dd93fcd261beff9b.tar.bz2
plat-omap: android-display: Set min number of vram buffers
Omapfb requires at least one vram buffer Change-Id: I7d719856e3360314f8bccfba8fcbd3b518496b8b Signed-off-by: Peter Nordström <nordstrom@ti.com> Signed-off-by: Lajos Molnar <lajos@ti.com> Signed-off-by: Dima Svetlov <svetlov@ti.com>
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/android-display.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/android-display.c b/arch/arm/plat-omap/android-display.c
index 8644b17..c1307bb 100644
--- a/arch/arm/plat-omap/android-display.c
+++ b/arch/arm/plat-omap/android-display.c
@@ -152,14 +152,21 @@ static void set_vram_sizes(struct sgx_omaplfb_config *sgx_config,
struct omapfb_platform_data *fb,
struct omap_android_display_data *mem)
{
- u32 num_vram_buffers = 1;
+ u32 num_vram_buffers = 0;
u32 vram = 0;
int i;
+ if (fb && fb->mem_desc.region_cnt >= 1) {
+ /* Need at least 1 VRAM buffer for fb0 */
+ num_vram_buffers = 1;
+ }
+
if (sgx_config) {
vram += sgx_config->vram_reserve;
- num_vram_buffers = sgx_config->vram_buffers;
+ num_vram_buffers = max(sgx_config->vram_buffers,
+ num_vram_buffers);
}
+
vram += num_vram_buffers * vram_size(mem);
if (fb) {