diff options
| author | Xianzhong <b07117@freescale.com> | 2012-08-07 23:04:13 +0800 |
|---|---|---|
| committer | Xianzhong <b07117@freescale.com> | 2012-08-07 23:49:30 +0800 |
| commit | cd7116f0f5a212d15ec2dd924505c47db9af8a30 (patch) | |
| tree | 3047e1026d31ca78aaab46b7afadc08dfd4573d2 /arch | |
| parent | deae3ebb8ee10ea79b01f0e00b1770cf642b1e23 (diff) | |
ENGR00219602 revert "Refined the reserved memory for GPU and VPU"
This reverts commit 5b58b4b36a64e8f9df5cf2602d301c8301f6f594.
Camera encoder requires more VPU memory by ION due to perf,
Need consider to unify VPU and GPU memory management later
Signed-off-by: Xianzhong <b07117@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_arm2.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabreauto.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabrelite.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabresd.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_arm2.c b/arch/arm/mach-mx6/board-mx6q_arm2.c index 0a309b4672e6..64cba5af1f08 100644 --- a/arch/arm/mach-mx6/board-mx6q_arm2.c +++ b/arch/arm/mach-mx6/board-mx6q_arm2.c @@ -1247,7 +1247,7 @@ static void __init mx6_arm2_init_usb(void) } static struct viv_gpu_platform_data imx6_gpu_pdata __initdata = { - .reserved_mem_size = SZ_128M + SZ_32M, + .reserved_mem_size = SZ_128M, }; /* HW Initialization, if return 0, initialization is successful. */ @@ -1488,7 +1488,7 @@ static struct ion_platform_data imx_ion_data = { { .type = ION_HEAP_TYPE_CARVEOUT, .name = "vpu_ion", - .size = SZ_32M, + .size = SZ_64M, }, }, }; diff --git a/arch/arm/mach-mx6/board-mx6q_sabreauto.c b/arch/arm/mach-mx6/board-mx6q_sabreauto.c index 5e338791255a..4578ce1d003c 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabreauto.c +++ b/arch/arm/mach-mx6/board-mx6q_sabreauto.c @@ -765,7 +765,7 @@ static void __init imx6q_sabreauto_init_usb(void) } static struct viv_gpu_platform_data imx6q_gpu_pdata __initdata = { - .reserved_mem_size = SZ_128M + SZ_32M, + .reserved_mem_size = SZ_128M, }; /* HW Initialization, if return 0, initialization is successful. */ @@ -991,7 +991,7 @@ static struct ion_platform_data imx_ion_data = { { .type = ION_HEAP_TYPE_CARVEOUT, .name = "vpu_ion", - .size = SZ_32M, + .size = SZ_64M, }, }, }; diff --git a/arch/arm/mach-mx6/board-mx6q_sabrelite.c b/arch/arm/mach-mx6/board-mx6q_sabrelite.c index d5f29f13a01f..7208a49709ba 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabrelite.c +++ b/arch/arm/mach-mx6/board-mx6q_sabrelite.c @@ -756,7 +756,7 @@ static const struct flexcan_platform_data }; static struct viv_gpu_platform_data imx6q_gpu_pdata __initdata = { - .reserved_mem_size = SZ_128M + SZ_32M, + .reserved_mem_size = SZ_128M, }; static struct imx_asrc_platform_data imx_asrc_data = { @@ -875,7 +875,7 @@ static struct ion_platform_data imx_ion_data = { { .type = ION_HEAP_TYPE_CARVEOUT, .name = "vpu_ion", - .size = SZ_32M, + .size = SZ_64M, }, }, }; diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c index 30af77a90e04..594dfdff899a 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabresd.c +++ b/arch/arm/mach-mx6/board-mx6q_sabresd.c @@ -1206,7 +1206,7 @@ static const struct flexcan_platform_data }; static struct viv_gpu_platform_data imx6q_gpu_pdata __initdata = { - .reserved_mem_size = SZ_128M + SZ_32M, + .reserved_mem_size = SZ_128M, }; static struct imx_asrc_platform_data imx_asrc_data = { @@ -1368,7 +1368,7 @@ static struct ion_platform_data imx_ion_data = { .id = 0, .type = ION_HEAP_TYPE_CARVEOUT, .name = "vpu_ion", - .size = SZ_32M, + .size = SZ_64M, }, }, }; |