update the conctrl of gpu' clk

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 7ef485080f363b41ee976ca76db7216d155920cb..ea477e089899140802ac7a1f7e990d07456e0b62 100755 (executable)
--- 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
@@ -526,6 +526,8 @@ static int drv_init(void)
                  "Entering drv_init\n");
 
 #if ENABLE_GPU_CLOCK_BY_DRIVER && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
+
+    printk("%s : gpu clk_enable... ", __func__);
     // clk_gpu_ahb
     clk_hclk_gpu = clk_get(NULL, "hclk_gpu");
     if(!IS_ERR(clk_hclk_gpu))    clk_enable(clk_hclk_gpu);
@@ -566,22 +568,32 @@ static int drv_init(void)
         return -EAGAIN;
     }
     clk_enable(clk_gpu);
+    printk("done!\n");
 
     // enable ram clock gate
     writel(readl(RK29_GRF_BASE+0xc0) & ~0x100000, RK29_GRF_BASE+0xc0);
     
 #if 1
-    printk("%s : gpu reset... ", __func__);
     mdelay(2);
+    printk("%s : gpu reset... ", __func__);
     cru_set_soft_reset(SOFT_RST_GPU, true);
     cru_set_soft_reset(SOFT_RST_DDR_GPU_PORT, true);
     mdelay(1);
     cru_set_soft_reset(SOFT_RST_DDR_GPU_PORT, false);
     cru_set_soft_reset(SOFT_RST_GPU, false);
-    mdelay(2);
     printk("done!\n");
+    mdelay(2);
 #endif
-    
+
+    printk("%s : gpu clk_disable...  ", __func__);
+    mdelay(1);
+    clk_disable(clk_gpu);
+    clk_disable(clk_aclk_gpu);
+    clk_disable(clk_get(NULL, "aclk_ddr_gpu"));
+    clk_disable(clk_hclk_gpu);
+    mdelay(1);
+    printk("done!\n");
+
 #endif
 
        if (showArgs)

diff --git a/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_os.c b/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_os.c
index b6bcbe3b158b5b9d2f025bd40670691009882350..a2204747b6b429dcdef75d4b6752587bd78be7e4 100755 (executable)
--- a/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_os.c
+++ b/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_os.c
@@ -5932,35 +5932,41 @@ gckOS_SetGPUPower(
     struct clk * clk_aclk_ddr_gpu = clk_get(NULL, "aclk_ddr_gpu");
     struct clk * clk_hclk_gpu = clk_get(NULL, "hclk_gpu");
     static int lastpower = 0;
+    static int lastclock = 0;
 
     //printk("---------- gckOS_SetGPUPower Clock=%d Power=%d \n", Clock, Power);
 
-    if(Clock) {
-        printk("gpu: clk_enable... ");
-        clk_enable(clk_hclk_gpu);
-        clk_enable(clk_aclk_gpu);
-        clk_enable(clk_aclk_ddr_gpu);
-        clk_enable(clk_gpu);
-        printk("done!\n");
-    } else {
-        printk("gpu: clk_disable... ");
-        clk_disable(clk_gpu);
-        clk_disable(clk_aclk_gpu);
-        clk_disable(clk_aclk_ddr_gpu);
-        clk_disable(clk_hclk_gpu);
-        printk("done!\n");
+    if(lastclock!=Clock) 
+    {
+        if(Clock) {
+            printk("gpu: clk_enable... ");
+            clk_enable(clk_hclk_gpu);
+            clk_enable(clk_aclk_gpu);
+            clk_enable(clk_aclk_ddr_gpu);
+            clk_enable(clk_gpu);
+            printk("done!\n");
+        } else {
+            printk("gpu: clk_disable... ");
+            clk_disable(clk_gpu);
+            clk_disable(clk_aclk_gpu);
+            clk_disable(clk_aclk_ddr_gpu);
+            clk_disable(clk_hclk_gpu);
+            printk("done!\n");
+        }
     }
+    lastclock = Clock;
 
-    if(Power) {
-        if(lastpower != Power) {
+    if(lastpower!=Power)
+    {
+        if(Power) {
             printk("gpu: power on... ");
             pmu_set_power_domain(PD_GPU, true);
             printk("done!\n");
+        } else {
+            //printk("gpu: power off... ");
+            //pmu_set_power_domain(PD_GPU, false);
+            //printk("done!\n");
         }
-    } else {
-        //printk("gpu: power off... ");
-        //pmu_set_power_domain(PD_GPU, false);
-        //printk("done!\n");
     }
     lastpower = Power;