From c532e3bcc9beb5572e48a0e235da511dddc42601 Mon Sep 17 00:00:00 2001 From: Ahmed Ammar Date: Sun, 20 Jan 2013 05:07:04 -0600 Subject: [PATCH] amd-gpu: increase MEM1 area - fixes issue where allocations fail after compiz started. --- arch/arm/mach-mx5/mx51_efikamx.c | 2 +- drivers/mxc/amd-gpu/include/gsl_halconfig.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-mx5/mx51_efikamx.c b/arch/arm/mach-mx5/mx51_efikamx.c index 376bed13d43..9e9fe08a2e3 100644 --- a/arch/arm/mach-mx5/mx51_efikamx.c +++ b/arch/arm/mach-mx5/mx51_efikamx.c @@ -290,7 +290,7 @@ static void __init mx51_efikamx_fixup(struct machine_desc *desc, struct tag *tag struct tag *mem_tag = 0; int total_mem = SZ_512M; int fb_mem = SZ_16M; - int gpu_mem = SZ_32M; + int gpu_mem = SZ_32M + SZ_16M; int sys_mem; mxc_set_cpu_type(MXC_CPU_MX51); diff --git a/drivers/mxc/amd-gpu/include/gsl_halconfig.h b/drivers/mxc/amd-gpu/include/gsl_halconfig.h index 123bcc1b677..140f00bae1d 100755 --- a/drivers/mxc/amd-gpu/include/gsl_halconfig.h +++ b/drivers/mxc/amd-gpu/include/gsl_halconfig.h @@ -39,7 +39,7 @@ #define GSL_HAL_SIZE_REG_G12 SZ_4K /* 4KB */ #define GSL_HAL_SHMEM_SIZE_EMEM_MMU SZ_128M -#define GSL_HAL_SHMEM_SIZE_EMEM_NOMMU SZ_8M +#define GSL_HAL_SHMEM_SIZE_EMEM_NOMMU SZ_16M /* physical memory area is reserved size minus emem area if no mmu */