shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10

Browse Source
This commit is contained in:
wlf
2014-03-26 20:59:24 +08:00
parent 60008d3d28 2e66b1a937
commit 5cebb12445
4 changed files with 67 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_config_rk.c Normal file → Executable file
View File

@@ -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 400000
#define KBASE_VE_GPU_FREQ_KHZ_MAX 600000
#define KBASE_VE_GPU_FREQ_KHZ_MIN 100000
#ifdef CONFIG_UMP
#define KBASE_VE_UMP_DEVICE UMP_DEVICE_Z_SHIFT
@@ -257,9 +257,11 @@ static kbase_pm_callback_conf pm_callbacks = {
/* Please keep table config_attributes in sync with config_attributes_hw_issue_8408 */
static kbase_attribute config_attributes[] = {
#if 0
{
KBASE_CONFIG_ATTR_MEMORY_PER_PROCESS_LIMIT,
KBASE_VE_MEMORY_PER_PROCESS_LIMIT},
#endif
#ifdef CONFIG_UMP
{
KBASE_CONFIG_ATTR_UMP_DEVICE,
@@ -270,15 +272,16 @@ static kbase_attribute config_attributes[] = {
KBASE_CONFIG_ATTR_POWER_MANAGEMENT_CALLBACKS,
(uintptr_t)&pm_callbacks},
#endif
#if 0
{
KBASE_CONFIG_ATTR_MEMORY_OS_SHARED_MAX,
KBASE_VE_MEMORY_OS_SHARED_MAX},
#endif
#if 0
{
KBASE_CONFIG_ATTR_MEMORY_OS_SHARED_PERF_GPU,
KBASE_VE_MEMORY_OS_SHARED_PERF_GPU},
#endif
{
KBASE_CONFIG_ATTR_PLATFORM_FUNCS,
(uintptr_t) &platform_funcs},
@@ -318,50 +321,62 @@ static kbase_attribute config_attributes[] = {
KBASE_VE_JS_RESET_TICKS_NSS_DEBUG},
#else /* CONFIG_MALI_DEBUG */
/* In release builds same as the defaults but scaled for 5MHz FPGA */
#if 0
{
KBASE_CONFIG_ATTR_JS_SCHEDULING_TICK_NS,
KBASE_VE_JS_SCHEDULING_TICK_NS},
#endif
#if 0
{
KBASE_CONFIG_ATTR_JS_SOFT_STOP_TICKS,
KBASE_VE_JS_SOFT_STOP_TICKS},
#endif
#if 0
{
KBASE_CONFIG_ATTR_JS_HARD_STOP_TICKS_SS,
KBASE_VE_JS_HARD_STOP_TICKS_SS},
#endif
#if 0
{
KBASE_CONFIG_ATTR_JS_HARD_STOP_TICKS_NSS,
KBASE_VE_JS_HARD_STOP_TICKS_NSS},
#endif
#if 0
{
KBASE_CONFIG_ATTR_JS_RESET_TICKS_SS,
KBASE_VE_JS_RESET_TICKS_SS},
#endif
#if 0
{
KBASE_CONFIG_ATTR_JS_RESET_TICKS_NSS,
KBASE_VE_JS_RESET_TICKS_NSS},
#endif
#endif /* CONFIG_MALI_DEBUG */
#if 0
{
KBASE_CONFIG_ATTR_JS_RESET_TIMEOUT_MS,
KBASE_VE_JS_RESET_TIMEOUT_MS},
#endif
#if 0
{
KBASE_CONFIG_ATTR_JS_CTX_TIMESLICE_NS,
KBASE_VE_JS_CTX_TIMESLICE_NS},
#endif
#if 0
{
KBASE_CONFIG_ATTR_CPU_SPEED_FUNC,
KBASE_VE_CPU_SPEED_FUNC},
#endif
#if 0
{
KBASE_CONFIG_ATTR_SECURE_BUT_LOSS_OF_PERFORMANCE,
KBASE_VE_SECURE_BUT_LOSS_OF_PERFORMANCE},
#endif
#if 0
{
KBASE_CONFIG_ATTR_GPU_IRQ_THROTTLE_TIME_US,
20},
#endif
{
KBASE_CONFIG_ATTR_END,
0}

36
drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_dvfs.c Normal file → Executable file
View File

@@ -55,13 +55,12 @@ typedef struct _mali_dvfs_info {
} mali_dvfs_info;
static mali_dvfs_info mali_dvfs_infotbl[] = {
{925000, 100, 0, 70, 0},
{925000, 160, 50, 65, 0},
{1025000, 266, 60, 78, 0},
{1075000, 350, 70, 80, 0},
{1125000, 400, 70, 80, 0},
{1150000, 450, 76, 99, 0},
{1200000, 533, 99, 100, 0},
{925000, 100, 0, 70, 0},
{925000, 160, 50, 65, 0},
{1025000, 266, 60, 78, 0},
{1075000, 350, 65, 75, 0},
{1125000, 400, 70, 75, 0},
{1200000, 600, 90, 100, 0},
};
#define MALI_DVFS_STEP ARRAY_SIZE(mali_dvfs_infotbl)
@@ -109,6 +108,7 @@ static void mali_dvfs_event_proc(struct work_struct *w)
spin_lock_irqsave(&mali_dvfs_spinlock, flags);
if (dvfs_status->utilisation > mali_dvfs_infotbl[dvfs_status->step].max_threshold)
{
#if 0
if (dvfs_status->step==kbase_platform_dvfs_get_level(450))
{
if (platform->utilisation > mali_dvfs_infotbl[dvfs_status->step].max_threshold)
@@ -120,8 +120,13 @@ static void mali_dvfs_event_proc(struct work_struct *w)
dvfs_status->step++;
BUG_ON(dvfs_status->step >= MALI_DVFS_STEP);
}
#endif
dvfs_status->step++;
BUG_ON(dvfs_status->step >= MALI_DVFS_STEP);
}
else if((dvfs_status->step > 0) && (platform->time_tick == MALI_DVFS_TIME_INTERVAL) && (platform->utilisation < mali_dvfs_infotbl[dvfs_status->step].min_threshold))
else if((dvfs_status->step > 0) && (dvfs_status->utilisation < mali_dvfs_infotbl[dvfs_status->step].min_threshold))
//else if((dvfs_status->step > 0) && (platform->time_tick == MALI_DVFS_TIME_INTERVAL) && (platform->utilisation < mali_dvfs_infotbl[dvfs_status->step].min_threshold))
{
BUG_ON(dvfs_status->step <= 0);
dvfs_status->step--;
@@ -398,15 +403,14 @@ void kbase_platform_dvfs_set_clock(kbase_device *kbdev, int freq)
if (NULL == platform)
panic("oops");
if (platform->clk_mali == 0)
if (!platform->mali_clk_node)
{
printk("mali_clk_node not init\n");
return;
}
switch (freq) {
case 533:
aclk_400_rate = 533000000;
break;
case 450:
aclk_400_rate = 450000000;
case 600:
aclk_400_rate = 600000000;
break;
case 400:
aclk_400_rate = 400000000;
@@ -415,7 +419,7 @@ void kbase_platform_dvfs_set_clock(kbase_device *kbdev, int freq)
aclk_400_rate = 350000000;
break;
case 266:
aclk_400_rate = 267000000;
aclk_400_rate = 266000000;
break;
case 160:
aclk_400_rate = 160000000;

6
drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_dvfs.h Normal file → Executable file
View File

@@ -19,11 +19,11 @@
#define KBASE_PM_DVFS_FREQUENCY 100
#define MALI_DVFS_KEEP_STAY_CNT 10
#define MALI_DVFS_TIME_INTERVAL 5
#define MALI_DVFS_TIME_INTERVAL 2
#define MALI_DVFS_CURRENT_FREQ 0
#define MALI_DVFS_BL_CONFIG_FREQ 533
#define MALI_DVFS_START_FREQ 450
#define MALI_DVFS_BL_CONFIG_FREQ 600
#define MALI_DVFS_START_FREQ 400
#ifdef CONFIG_MALI_T6XX_DVFS
#define CONFIG_MALI_T6XX_FREQ_LOCK

34
drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_platform.c Normal file → Executable file
View File

@@ -78,7 +78,7 @@ static int kbase_platform_power_clock_init(kbase_device *kbdev)
if(IS_ERR_OR_NULL(platform->mali_pd_node))
{
platform->mali_pd_node = NULL;
printk(KERN_ERR "%s, %s(): failed to clk_get [platform->mali_pd_node]\n", __FILE__, __func__);
printk(KERN_ERR "%s, %s(): failed to get [platform->mali_pd_node]\n", __FILE__, __func__);
//goto out;
}
else
@@ -93,8 +93,8 @@ static int kbase_platform_power_clock_init(kbase_device *kbdev)
if (IS_ERR_OR_NULL(platform->mali_clk_node))
{
platform->mali_clk_node = NULL;
printk(KERN_ERR "%s, %s(): failed to clk_get [platform->mali_clk_node]\n", __FILE__, __func__);
//goto out;
printk(KERN_ERR "%s, %s(): failed to get [platform->mali_clk_node]\n", __FILE__, __func__);
goto out;
}
else
{
@@ -275,14 +275,16 @@ static ssize_t show_clock(struct device *dev, struct device_attribute *attr, cha
if (!platform)
return -ENODEV;
if (!platform->clk_mali)
if (!platform->mali_clk_node)
{
printk("mali_clk_node not init\n");
return -ENODEV;
}
clkrate = dvfs_clk_get_rate(platform->mali_clk_node);
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 : 533, 450, 400, 350, 266, 160, 100Mhz");
ret += snprintf(buf + ret, PAGE_SIZE - ret, "\nPossible settings : 600, 400, 350, 266, 160, 100Mhz");
if (ret < PAGE_SIZE - 1)
ret += snprintf(buf + ret, PAGE_SIZE - ret, "\n");
@@ -312,10 +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("533", buf)) {
freq = 533;
} else if (sysfs_streq("450", buf)) {
freq = 450;
if (sysfs_streq("600", buf)) {
freq = 600;
} 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 : 450, 400, 266, 160, 100, If you want to unlock : 533 or off");
ret += snprintf(buf + ret, PAGE_SIZE - ret, "\nPossible settings : 400, 350,266, 160, 100, If you want to unlock : 600 or off");
#else
ret += snprintf(buf + ret, PAGE_SIZE - ret, "mali DVFS is disabled. You can not set");
@@ -675,10 +675,8 @@ 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("533", buf)) {
} else if (sysfs_streq("600", buf)) {
mali_dvfs_freq_unlock();
} else if (sysfs_streq("450", buf)) {
mali_dvfs_freq_lock(5);
} else if (sysfs_streq("400", buf)) {
mali_dvfs_freq_lock(4);
} else if (sysfs_streq("350", buf)) {
@@ -691,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 : 450, 400, 266, 160, 100, If you want to unlock : 533\n");
dev_err(dev, "Possible settings : 400, 350,266, 160, 100, If you want to unlock : 600\n");
return -ENOENT;
}
#else /* CONFIG_MALI_T6XX_DVFS */
@@ -720,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 : 533, 450, 400, 266, 160, If you want to unlock : 100 or off");
ret += snprintf(buf + ret, PAGE_SIZE - ret, "\nPossible settings : 600, 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");
@@ -748,9 +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("533", buf)) {
mali_dvfs_freq_under_lock(6);
} else if (sysfs_streq("450", buf)) {
} else if (sysfs_streq("600", buf)) {
mali_dvfs_freq_under_lock(5);
} else if (sysfs_streq("400", buf)) {
mali_dvfs_freq_under_lock(4);