diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-04-24 14:45:30 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-04-24 14:45:30 +0800 |
| commit | 26fa259836535ae4f5d6332f2a797982602ca27d (patch) | |
| tree | b86a50a12a2b3c1ea216c5add7c2e2f153153284 | |
| parent | 1fab4e499f7db3cb19bafe92c37b684fe434ce1e (diff) | |
ENGR00180639 sabresd: remove GPU pmem device support
We do not use GPU pmem anymore, as all the graphic
memory allocation are go through gpu drivers, includes
surface buffers, camera buffers.
Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabresd.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c index 977ec971af6a..839997e41156 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabresd.c +++ b/arch/arm/mach-mx6/board-mx6q_sabresd.c @@ -1282,11 +1282,6 @@ static struct android_pmem_platform_data android_pmem_data = { .size = SZ_64M, }; -static struct android_pmem_platform_data android_pmem_gpu_data = { - .name = "pmem_gpu", - .size = SZ_32M, -}; - static void sabresd_suspend_enter(void) { /* suspend preparation */ @@ -1463,11 +1458,7 @@ static void __init fixup_mxc_board(struct machine_desc *desc, struct tag *tags, str = strstr(str, "pmem="); if (str != NULL) { str += 5; - android_pmem_gpu_data.size = memparse(str, &str); - if (*str == ',') { - str++; - android_pmem_data.size = memparse(str, &str); - } + android_pmem_data.size = memparse(str, &str); } str = t->u.cmdline.cmdline; @@ -1663,8 +1654,6 @@ static void __init mx6_sabresd_board_init(void) mx6_cpu_regulator_init(); mxc_register_device(&mxc_android_pmem_device, &android_pmem_data); - mxc_register_device(&mxc_android_pmem_gpu_device, - &android_pmem_gpu_data); imx6q_add_device_buttons(); /* enable sensor 3v3 and 1v8 */ @@ -1765,13 +1754,6 @@ static void __init mx6q_sabresd_reserve(void) memblock_remove(phys, android_pmem_data.size); android_pmem_data.start = phys; } - - if (android_pmem_gpu_data.size) { - phys = memblock_alloc(android_pmem_gpu_data.size, SZ_4K); - memblock_free(phys, android_pmem_gpu_data.size); - memblock_remove(phys, android_pmem_gpu_data.size); - android_pmem_gpu_data.start = phys; - } #endif for (i = 0; i < ARRAY_SIZE(sabresd_fb_data); i++) |