From: 杜坤明 <dkm@rock-chips.com>
Date: Wed, 15 Dec 2010 04:02:08 +0000 (+0800)
Subject: updata gpu driver & lcdc priority
X-Git-Tag: firefly_0821_release~10934
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=93a9f36a86ec67764496733eca4ea28ed95922df;p=firefly-linux-kernel-4.4.55.git

updata gpu driver & lcdc priority
---

diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
index ac5969ed337f..45495a7cd01d 100755
--- 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
+#define PMEM_GPU_SIZE       SZ_64M
 #define PMEM_UI_SIZE        SZ_32M
 #define PMEM_VPU_SIZE       SZ_32M
 #define PMEM_CAM_SIZE       SZ_16M
@@ -969,7 +969,7 @@ static struct resource resources_gpu[] = {
     [1] = {
 		.name = "gpu_base",
         .start  = RK29_GPU_PHYS,
-        .end    = RK29_GPU_PHYS + (256 << 10),
+        .end    = RK29_GPU_PHYS + RK29_GPU_PHYS_SIZE,
         .flags  = IORESOURCE_MEM,
     },
     [2] = {
diff --git a/drivers/staging/rk29/vivante/Makefile b/drivers/staging/rk29/vivante/Makefile
index e0b7a6b6a8eb..e4171f01ac18 100644
--- 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 752d858277c5..d0056060205d 100644
--- 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 5ddd95db8c8f..107605296d4e 100644
--- 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 3039c01d2873..c3e913ba35be 100755
--- 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);