updata gpu driver & lcdc priority

diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
index ac5969ed337f4520e39157b64677ed6440345a0d..45495a7cd01d7e01e06e7f4f07cfc91387a363bc 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@ -57,7 +57,7 @@
 #else
 #define SDRAM_SIZE          SZ_512M
 #endif
-#define PMEM_GPU_SIZE       SZ_48M\r
+#define PMEM_GPU_SIZE       SZ_64M\r
 #define PMEM_UI_SIZE        SZ_32M\r
 #define PMEM_VPU_SIZE       SZ_32M\r
 #define PMEM_CAM_SIZE       SZ_16M\r
@@ -969,7 +969,7 @@ static struct resource resources_gpu[] = {
     [1] = {\r
                .name = "gpu_base",\r
         .start  = RK29_GPU_PHYS,\r
-        .end    = RK29_GPU_PHYS + (256 << 10),\r
+        .end    = RK29_GPU_PHYS + RK29_GPU_PHYS_SIZE,\r
         .flags  = IORESOURCE_MEM,\r
     },\r
     [2] = {\r

diff --git a/drivers/staging/rk29/vivante/Makefile b/drivers/staging/rk29/vivante/Makefile
index e0b7a6b6a8eb1c60b6191525507be541f6a2c3ca..e4171f01ac18394942f2b07db1fa94ae7f732b69 100644 (file)
--- a/drivers/staging/rk29/vivante/Makefile
+++ b/drivers/staging/rk29/vivante/Makefile
@@ -71,7 +71,8 @@ ARCH_TYPE     ?= arm
 SDK_DIR                ?= $(AQROOT)/build/sdk
 USE_3D_VG      = 1
 
-DEBUG       = 1
+DEBUG       = 0
+gcdkREPORT_VIDMEM_USAGE = 1
 
 #DRIVER_OUT_DIR = hal/driver
 #KERNEL_DIR ?= $(TOOL_DIR)/kernel

diff --git a/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_device.c b/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_device.c
index 752d858277c5c9ed7e06b5226bf581f874eacd2e..d0056060205d5b091858aecfc8bf333ae1158f85 100644 (file)
--- a/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_device.c
+++ b/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_device.c
@@ -721,6 +721,8 @@ gckGALDEVICE_Construct(
             device->contiguousSize     = ContiguousSize;
             device->contiguousBase     = (gctPOINTER) ioremap_nocache(ContiguousBase, ContiguousSize);
             device->contiguousMapped   = gcvTRUE;
+            printk(">>>> gckGALDEVICE_Construct  device (contiguousBase=0x%08x, contiguousSize=0x%08x) \n", 
+                (u32)device->contiguousBase, (u32)device->contiguousSize);
 
             if (device->contiguousBase == gcvNULL)
             {

diff --git a/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_driver.c b/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_driver.c
index 5ddd95db8c8f6a92fdf9d57dcdf09c6d6f7e9998..107605296d4ef0371364e82321b800879b09e314 100644 (file)
--- a/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_driver.c
+++ b/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_driver.c
@@ -62,7 +62,7 @@ module_param(contiguousBase, ulong, 0644);
 long bankSize = 32 << 20;
 module_param(bankSize, long, 0644);
 
-int fastClear = -1;
+int fastClear = 0;   //-1;
 module_param(fastClear, int, 0644);
 
 int compression = -1;

diff --git a/drivers/video/rk29_fb.c b/drivers/video/rk29_fb.c
index 3039c01d28733b3c4ccad4e2ab4d6fe21614a7b6..c3e913ba35be6aff61e42232ebc71282c0668eaa 100755 (executable)
--- a/drivers/video/rk29_fb.c
+++ b/drivers/video/rk29_fb.c
@@ -1714,6 +1714,8 @@ static int __init rk29fb_probe (struct platform_device *pdev)
 
     fbprintk(">>>>>> %s : %s\n", __FILE__, __FUNCTION__);
 
+    *(volatile u32 *)(RK29_GRF_BASE+0xac) = ((*(volatile u32 *)(RK29_GRF_BASE+0xac)) & ~0x3FF) | 0x246;
+
     /* Malloc rk29fb_inf and set it to pdev for drvdata */
     fbprintk(">> Malloc rk29fb_inf and set it to pdev for drvdata \n");
     inf = kmalloc(sizeof(struct rk29fb_inf), GFP_KERNEL);