From: xxm Date: Thu, 3 Apr 2014 06:48:34 +0000 (+0800) Subject: rk3288 gpu : dvfs level max 500MHz X-Git-Tag: firefly_0821_release~5627 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=225e6a49d309257d55b8963458addce59619d8b4;p=firefly-linux-kernel-4.4.55.git rk3288 gpu : dvfs level max 500MHz --- diff --git a/drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_config_rk.c b/drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_config_rk.c index d3b8875e2938..bd7a913ebc10 100755 --- a/drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_config_rk.c +++ b/drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_config_rk.c @@ -43,7 +43,7 @@ int get_cpu_clock_speed(u32 *cpu_clock); #define KBASE_VE_MEMORY_PER_PROCESS_LIMIT (512 * 1024 * 1024UL) /* 512MB */ #define KBASE_VE_MEMORY_OS_SHARED_MAX (2048 * 1024 * 1024UL) /* 768MB */ #define KBASE_VE_MEMORY_OS_SHARED_PERF_GPU KBASE_MEM_PERF_FAST/*KBASE_MEM_PERF_SLOW*/ -#define KBASE_VE_GPU_FREQ_KHZ_MAX 600000 +#define KBASE_VE_GPU_FREQ_KHZ_MAX 500000 #define KBASE_VE_GPU_FREQ_KHZ_MIN 100000 #ifdef CONFIG_UMP #define KBASE_VE_UMP_DEVICE UMP_DEVICE_Z_SHIFT diff --git a/drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_dvfs.c b/drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_dvfs.c index e80c99a49c0e..b395b3ac1991 100755 --- a/drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_dvfs.c +++ b/drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_dvfs.c @@ -60,7 +60,7 @@ static mali_dvfs_info mali_dvfs_infotbl[] = { {1025000, 266, 60, 78, 0}, {1075000, 350, 65, 75, 0}, {1125000, 400, 70, 75, 0}, - {1200000, 600, 90, 100, 0}, + {1200000, 500, 90, 100, 0}, }; #define MALI_DVFS_STEP ARRAY_SIZE(mali_dvfs_infotbl) @@ -409,8 +409,8 @@ void kbase_platform_dvfs_set_clock(kbase_device *kbdev, int freq) return; } switch (freq) { - case 600: - aclk_400_rate = 600000000; + case 500: + aclk_400_rate = 500000000; break; case 400: aclk_400_rate = 400000000; diff --git a/drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_dvfs.h b/drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_dvfs.h index 9a09d71ea774..64d9dac45611 100755 --- a/drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_dvfs.h +++ b/drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_dvfs.h @@ -22,7 +22,7 @@ #define MALI_DVFS_TIME_INTERVAL 2 #define MALI_DVFS_CURRENT_FREQ 0 -#define MALI_DVFS_BL_CONFIG_FREQ 600 +#define MALI_DVFS_BL_CONFIG_FREQ 500 #define MALI_DVFS_START_FREQ 400 #ifdef CONFIG_MALI_T6XX_DVFS diff --git a/drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_platform.c b/drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_platform.c index 0763b22b21b9..157e210a7e41 100755 --- a/drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_platform.c +++ b/drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_platform.c @@ -284,7 +284,7 @@ static ssize_t show_clock(struct device *dev, struct device_attribute *attr, cha ret += snprintf(buf + ret, PAGE_SIZE - ret, "Current clk mali = %dMhz", clkrate / 1000000); /* To be revised */ - ret += snprintf(buf + ret, PAGE_SIZE - ret, "\nPossible settings : 600, 400, 350, 266, 160, 100Mhz"); + ret += snprintf(buf + ret, PAGE_SIZE - ret, "\nPossible settings : 500, 400, 350, 266, 160, 100Mhz"); if (ret < PAGE_SIZE - 1) ret += snprintf(buf + ret, PAGE_SIZE - ret, "\n"); @@ -314,8 +314,8 @@ static ssize_t set_clock(struct device *dev, struct device_attribute *attr, cons if (!platform->mali_clk_node) return -ENODEV; - if (sysfs_streq("600", buf)) { - freq = 600; + if (sysfs_streq("500", buf)) { + freq = 500; } else if (sysfs_streq("400", buf)) { freq = 400; } else if (sysfs_streq("350", buf)) { @@ -647,7 +647,7 @@ static ssize_t show_upper_lock_dvfs(struct device *dev, struct device_attribute ret += snprintf(buf + ret, PAGE_SIZE - ret, "Current Upper Lock Level = %dMhz", locked_level); else ret += snprintf(buf + ret, PAGE_SIZE - ret, "Unset the Upper Lock Level"); - ret += snprintf(buf + ret, PAGE_SIZE - ret, "\nPossible settings : 400, 350,266, 160, 100, If you want to unlock : 600 or off"); + ret += snprintf(buf + ret, PAGE_SIZE - ret, "\nPossible settings : 400, 350,266, 160, 100, If you want to unlock : 500 or off"); #else ret += snprintf(buf + ret, PAGE_SIZE - ret, "mali DVFS is disabled. You can not set"); @@ -675,7 +675,7 @@ static ssize_t set_upper_lock_dvfs(struct device *dev, struct device_attribute * #ifdef CONFIG_MALI_T6XX_DVFS if (sysfs_streq("off", buf)) { mali_dvfs_freq_unlock(); - } else if (sysfs_streq("600", buf)) { + } else if (sysfs_streq("500", buf)) { mali_dvfs_freq_unlock(); } else if (sysfs_streq("400", buf)) { mali_dvfs_freq_lock(4); @@ -689,7 +689,7 @@ static ssize_t set_upper_lock_dvfs(struct device *dev, struct device_attribute * mali_dvfs_freq_lock(0); } else { dev_err(dev, "set_clock: invalid value\n"); - dev_err(dev, "Possible settings : 400, 350,266, 160, 100, If you want to unlock : 600\n"); + dev_err(dev, "Possible settings : 400, 350,266, 160, 100, If you want to unlock : 500\n"); return -ENOENT; } #else /* CONFIG_MALI_T6XX_DVFS */ @@ -718,7 +718,7 @@ static ssize_t show_under_lock_dvfs(struct device *dev, struct device_attribute ret += snprintf(buf + ret, PAGE_SIZE - ret, "Current Under Lock Level = %dMhz", locked_level); else ret += snprintf(buf + ret, PAGE_SIZE - ret, "Unset the Under Lock Level"); - ret += snprintf(buf + ret, PAGE_SIZE - ret, "\nPossible settings : 600, 400, 350,266, 160, If you want to unlock : 100 or off"); + ret += snprintf(buf + ret, PAGE_SIZE - ret, "\nPossible settings : 500, 400, 350,266, 160, If you want to unlock : 100 or off"); #else ret += snprintf(buf + ret, PAGE_SIZE - ret, "mali DVFS is disabled. You can not set"); @@ -746,7 +746,7 @@ static ssize_t set_under_lock_dvfs(struct device *dev, struct device_attribute * #ifdef CONFIG_MALI_T6XX_DVFS if (sysfs_streq("off", buf)) { mali_dvfs_freq_under_unlock(); - } else if (sysfs_streq("600", buf)) { + } else if (sysfs_streq("500", buf)) { mali_dvfs_freq_under_lock(5); } else if (sysfs_streq("400", buf)) { mali_dvfs_freq_under_lock(4); @@ -760,7 +760,7 @@ static ssize_t set_under_lock_dvfs(struct device *dev, struct device_attribute * mali_dvfs_freq_under_unlock(); } else { dev_err(dev, "set_clock: invalid value\n"); - dev_err(dev, "Possible settings : 533, 450, 400, 266, 160, If you want to unlock : 100 or off\n"); + dev_err(dev, "Possible settings : 500, 400,350,266, 160, If you want to unlock : 100 or off\n"); return -ENOENT; } #else