From: zxl <zhuangxl@rock-chips.com>
Date: Tue, 23 Jun 2015 01:11:36 +0000 (+0800)
Subject: RK3368 GPU version: Rogue L 0.18
X-Git-Tag: firefly_0821_release~4002
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=14dd34f3787ca5d281b3256333ff46b5c1940c55;p=firefly-linux-kernel-4.4.55.git

RK3368 GPU version: Rogue L 0.18
If fix freq,then don't force to drop freq to the lowest.
---

diff --git a/drivers/gpu/rogue/include/pvrversion.h b/drivers/gpu/rogue/include/pvrversion.h
index f763ca080be4..f11890a0bcb6 100755
--- a/drivers/gpu/rogue/include/pvrversion.h
+++ b/drivers/gpu/rogue/include/pvrversion.h
@@ -53,6 +53,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *          Add rk_tf_check_version to compatible for rk3328.
  *  L 0.17:
  *          merge 1.4_ED3573678 DDK code
+ *  L 0.18:
+ *          If fix freq,then don't force to drop freq to the lowest.
  */
 
 #define PVR_STR(X) #X
@@ -80,5 +82,5 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define PVRVERSION_UNPACK_MIN(VERSION) (((VERSION) >> 0) & 0xFFFF)
 
 //chenli:define rockchip version
-#define RKVERSION                   "Rogue L 0.17"
+#define RKVERSION                   "Rogue L 0.18"
 #endif /* _PVRVERSION_H_ */
diff --git a/drivers/gpu/rogue/system/rk3368/rk_init.c b/drivers/gpu/rogue/system/rk3368/rk_init.c
index 28d2143b0878..d4e4f3ee8973 100755
--- a/drivers/gpu/rogue/system/rk3368/rk_init.c
+++ b/drivers/gpu/rogue/system/rk3368/rk_init.c
@@ -1795,8 +1795,11 @@ static IMG_VOID RgxDisableClock(IMG_VOID)
     if (platform->aclk_gpu_mem && platform->aclk_gpu_cfg && platform->gpu_active)
     {
 #if RK33_DVFS_SUPPORT
-        //Force to drop freq to the lowest.
-        rk33_dvfs_set_level(0);
+        if(platform->fix_freq <= 0)
+        {
+            //Force to drop freq to the lowest.
+            rk33_dvfs_set_level(0);
+        }
 
         if(platform->dvfs_enabled && platform->timer_active)
         {