diff options
| author | Simon Wilson <simonwilson@google.com> | 2010-11-11 13:27:33 -0800 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2011-11-17 17:52:28 -0800 |
| commit | b3a247496a1c65e17c3afcbf6c4fb1578083a985 (patch) | |
| tree | 9971460ea85f2ce828efa403c18d7b72f5e4c8ab | |
| parent | 8111efb6a726aef134b2ad7021609b1842aa7b99 (diff) | |
| download | kernel_samsung_crespo-b3a247496a1c65e17c3afcbf6c4fb1578083a985.zip kernel_samsung_crespo-b3a247496a1c65e17c3afcbf6c4fb1578083a985.tar.gz kernel_samsung_crespo-b3a247496a1c65e17c3afcbf6c4fb1578083a985.tar.bz2 | |
ARM: herring: add calculation for FIMD size
Instead of using a fixed-size number, calculate the required
FIMD size from the LCD size and number of framebuffers.
Signed-off-by: Simon Wilson <simonwilson@google.com>
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-herring.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/mach-s5pv210/mach-herring.c b/arch/arm/mach-s5pv210/mach-herring.c index c9cce1f..72222fc 100644 --- a/arch/arm/mach-s5pv210/mach-herring.c +++ b/arch/arm/mach-s5pv210/mach-herring.c @@ -271,9 +271,12 @@ static struct s3c2410_uartcfg herring_uartcfgs[] __initdata = { }, }; +#define S5PV210_LCD_WIDTH 480 +#define S5PV210_LCD_HEIGHT 800 + static struct s3cfb_lcd s6e63m0 = { - .width = 480, - .height = 800, + .width = S5PV210_LCD_WIDTH, + .height = S5PV210_LCD_HEIGHT, .p_width = 52, .p_height = 86, .bpp = 24, @@ -302,7 +305,9 @@ static struct s3cfb_lcd s6e63m0 = { #define S5PV210_VIDEO_SAMSUNG_MEMSIZE_FIMC2 (6144 * SZ_1K) #define S5PV210_VIDEO_SAMSUNG_MEMSIZE_MFC0 (36864 * SZ_1K) #define S5PV210_VIDEO_SAMSUNG_MEMSIZE_MFC1 (36864 * SZ_1K) -#define S5PV210_VIDEO_SAMSUNG_MEMSIZE_FIMD (4800 * SZ_1K) +#define S5PV210_VIDEO_SAMSUNG_MEMSIZE_FIMD (S5PV210_LCD_WIDTH * \ + S5PV210_LCD_HEIGHT * 4 * \ + CONFIG_FB_S3C_NR_BUFFERS) #define S5PV210_VIDEO_SAMSUNG_MEMSIZE_JPEG (8192 * SZ_1K) static struct s5p_media_device herring_media_devs[] = { |