shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-04-19 03:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

board rk30 sdk,LR097 DS1006H,rk3168 tb:use get_fb_size instead of RK30_FB0_MEM_SIZE

Browse Source
This commit is contained in:
yxj
2013-01-23 11:36:50 +08:00
parent 4673caa440
commit 024dbf593e
4 changed files with 36 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/mach-rk30/board-rk30-sdk.c
View File

@@ -79,11 +79,6 @@
#if defined(CONFIG_DP501) //for display port transmitter dp501
#include<linux/dp501.h>
#endif
#ifdef CONFIG_THREE_FB_BUFFER
#define RK30_FB0_MEM_SIZE 12*SZ_1M
#else
#define RK30_FB0_MEM_SIZE 8*SZ_1M
#endif
#include "board-rk30-sdk-camera.c"
@@ -1845,16 +1840,16 @@ static void __init rk30_reserve(void)
rk30_ion_pdata.heaps[0].base = board_mem_reserve_add("ion", ION_RESERVE_SIZE);
#endif
#ifdef CONFIG_FB_ROCKCHIP
resource_fb[0].start = board_mem_reserve_add("fb0 buf", RK30_FB0_MEM_SIZE);
resource_fb[0].end = resource_fb[0].start + RK30_FB0_MEM_SIZE - 1;
resource_fb[0].start = board_mem_reserve_add("fb0 buf", get_fb_size());
resource_fb[0].end = resource_fb[0].start + get_fb_size()- 1;
#if 0
resource_fb[1].start = board_mem_reserve_add("ipp buf", RK30_FB0_MEM_SIZE);
resource_fb[1].end = resource_fb[1].start + RK30_FB0_MEM_SIZE - 1;
#endif
#if defined(CONFIG_FB_ROTATE) || !defined(CONFIG_THREE_FB_BUFFER)
resource_fb[2].start = board_mem_reserve_add("fb2 buf", RK30_FB0_MEM_SIZE);
resource_fb[2].end = resource_fb[2].start + RK30_FB0_MEM_SIZE - 1;
resource_fb[2].start = board_mem_reserve_add("fb2 buf",get_fb_size());
resource_fb[2].end = resource_fb[2].start + get_fb_size() - 1;
#endif
#endif
#ifdef CONFIG_VIDEO_RK29

21
arch/arm/mach-rk30/board-rk3168-LR097.c
View File

@@ -84,11 +84,6 @@
#include "../../../drivers/staging/android/timed_gpio.h"
#endif
#ifdef CONFIG_THREE_FB_BUFFER
#define RK30_FB0_MEM_SIZE 36*SZ_1M
#else
#define RK30_FB0_MEM_SIZE 24*SZ_1M
#endif
#include "board-rk3168-LR097-camera.c"
@@ -2140,15 +2135,19 @@ static void __init rk30_reserve(void)
rk30_ion_pdata.heaps[0].base = board_mem_reserve_add("ion", ION_RESERVE_SIZE);
#endif
#ifdef CONFIG_FB_ROCKCHIP
resource_fb[0].start = board_mem_reserve_add("fb0", RK30_FB0_MEM_SIZE);
resource_fb[0].end = resource_fb[0].start + RK30_FB0_MEM_SIZE - 1;
#if 0
resource_fb[0].start = board_mem_reserve_add("fb0 buf", get_fb_size());
resource_fb[0].end = resource_fb[0].start + get_fb_size()- 1;
#if 0
resource_fb[1].start = board_mem_reserve_add("ipp buf", RK30_FB0_MEM_SIZE);
resource_fb[1].end = resource_fb[1].start + RK30_FB0_MEM_SIZE - 1;
resource_fb[2].start = board_mem_reserve_add("fb2", RK30_FB0_MEM_SIZE);
resource_fb[2].end = resource_fb[2].start + RK30_FB0_MEM_SIZE - 1;
#endif
#endif
#if defined(CONFIG_FB_ROTATE) || !defined(CONFIG_THREE_FB_BUFFER)
resource_fb[2].start = board_mem_reserve_add("fb2 buf",get_fb_size());
resource_fb[2].end = resource_fb[2].start + get_fb_size() - 1;
#endif
#endif
#ifdef CONFIG_VIDEO_RK29
rk30_camera_request_reserve_mem();
#endif

24
arch/arm/mach-rk30/board-rk3168-ds1006h.c
View File

@@ -69,12 +69,6 @@
#include <linux/gps.h>
#endif
#ifdef CONFIG_THREE_FB_BUFFER
#define RK30_FB0_MEM_SIZE 12*SZ_1M
#else
#define RK30_FB0_MEM_SIZE 8*SZ_1M
#endif
#include "board-rk3168-ds1006h-camera.c"
#include <plat/key.h>
@@ -1703,16 +1697,22 @@ static void __init rk30_reserve(void)
#ifdef CONFIG_ION
rk30_ion_pdata.heaps[0].base = board_mem_reserve_add("ion", ION_RESERVE_SIZE);
#endif
#ifdef CONFIG_FB_ROCKCHIP
resource_fb[0].start = board_mem_reserve_add("fb0", RK30_FB0_MEM_SIZE);
resource_fb[0].end = resource_fb[0].start + RK30_FB0_MEM_SIZE - 1;
#if 0
resource_fb[0].start = board_mem_reserve_add("fb0 buf", get_fb_size());
resource_fb[0].end = resource_fb[0].start + get_fb_size()- 1;
#if 0
resource_fb[1].start = board_mem_reserve_add("ipp buf", RK30_FB0_MEM_SIZE);
resource_fb[1].end = resource_fb[1].start + RK30_FB0_MEM_SIZE - 1;
resource_fb[2].start = board_mem_reserve_add("fb2", RK30_FB0_MEM_SIZE);
resource_fb[2].end = resource_fb[2].start + RK30_FB0_MEM_SIZE - 1;
#endif
#endif
#if defined(CONFIG_FB_ROTATE) || !defined(CONFIG_THREE_FB_BUFFER)
resource_fb[2].start = board_mem_reserve_add("fb2 buf",get_fb_size());
resource_fb[2].end = resource_fb[2].start + get_fb_size() - 1;
#endif
#endif
#ifdef CONFIG_VIDEO_RK29
rk30_camera_request_reserve_mem();
#endif

22
arch/arm/mach-rk30/board-rk3168-tb.c
View File

@@ -76,12 +76,6 @@
#include "../../../drivers/staging/android/timed_gpio.h"
#endif
#ifdef CONFIG_THREE_FB_BUFFER
#define RK30_FB0_MEM_SIZE 12*SZ_1M
#else
#define RK30_FB0_MEM_SIZE 8*SZ_1M
#endif
#include "board-rk3168-tb-camera.c"
#if defined(CONFIG_TOUCHSCREEN_GT8XX)
@@ -1966,15 +1960,19 @@ static void __init rk30_reserve(void)
rk30_ion_pdata.heaps[0].base = board_mem_reserve_add("ion", ION_RESERVE_SIZE);
#endif
#ifdef CONFIG_FB_ROCKCHIP
resource_fb[0].start = board_mem_reserve_add("fb0", RK30_FB0_MEM_SIZE);
resource_fb[0].end = resource_fb[0].start + RK30_FB0_MEM_SIZE - 1;
#if 0
resource_fb[0].start = board_mem_reserve_add("fb0 buf", get_fb_size());
resource_fb[0].end = resource_fb[0].start + get_fb_size()- 1;
#if 0
resource_fb[1].start = board_mem_reserve_add("ipp buf", RK30_FB0_MEM_SIZE);
resource_fb[1].end = resource_fb[1].start + RK30_FB0_MEM_SIZE - 1;
resource_fb[2].start = board_mem_reserve_add("fb2", RK30_FB0_MEM_SIZE);
resource_fb[2].end = resource_fb[2].start + RK30_FB0_MEM_SIZE - 1;
#endif
#endif
#if defined(CONFIG_FB_ROTATE) || !defined(CONFIG_THREE_FB_BUFFER)
resource_fb[2].start = board_mem_reserve_add("fb2 buf",get_fb_size());
resource_fb[2].end = resource_fb[2].start + get_fb_size() - 1;
#endif
#endif
#ifdef CONFIG_VIDEO_RK29
rk30_camera_request_reserve_mem();
#endif