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

rockchip:midgard:1,keep gpu clock when runtime resume 2,version to 0x07

Browse Source
This commit is contained in:
xxm
2014-07-21 14:47:44 +08:00
parent 3202904257
commit bac65c4e71
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/arm/midgard/mali_kbase_core_linux.c
View File

@@ -86,7 +86,7 @@ EXPORT_SYMBOL(shared_kernel_test_data);
#endif /* MALI_UNIT_TEST */
#define KBASE_DRV_NAME "mali"
#define ROCKCHIP_VERSION 6
#define ROCKCHIP_VERSION 7
static const char kbase_drv_name[] = KBASE_DRV_NAME;
static int kbase_dev_nr;

2
drivers/gpu/arm/midgard/platform/rk/mali_kbase_config_rk.c
View File

@@ -223,7 +223,7 @@ static int pm_callback_runtime_on(kbase_device *kbdev)
if (platform->dvfs_enabled) {
/*if (kbase_platform_dvfs_enable(true, MALI_DVFS_START_FREQ)!= MALI_TRUE)*/
/*printk("%s\n",__func__);*/
if (kbase_platform_dvfs_enable(true, p_mali_dvfs_infotbl[MALI_DVFS_STEP-1].clock)!= MALI_TRUE)
if (kbase_platform_dvfs_enable(true, MALI_DVFS_CURRENT_FREQ)!= MALI_TRUE)
return -EPERM;
} else {
if (kbase_platform_dvfs_enable(false, MALI_DVFS_CURRENT_FREQ)!= MALI_TRUE)

12
drivers/gpu/arm/midgard/platform/rk/mali_kbase_platform.c
View File

@@ -573,18 +573,26 @@ static ssize_t set_dtlb(struct device *dev, struct device_attribute *attr, const
static ssize_t show_dvfs(struct device *dev, struct device_attribute *attr, char *buf)
{
struct kbase_device *kbdev;
struct rk_context *platform;
ssize_t ret = 0;
unsigned int clkrate;
kbdev = dev_get_drvdata(dev);
if (!kbdev)
return -ENODEV;
platform = (struct rk_context *)kbdev->platform_context;
if (!platform)
return -ENODEV;
clkrate = dvfs_clk_get_rate(platform->mali_clk_node);
#ifdef CONFIG_MALI_MIDGARD_DVFS
if (kbase_platform_dvfs_get_enable_status())
ret += snprintf(buf + ret, PAGE_SIZE - ret, "mali DVFS is on\nutilisation:%d", kbase_platform_dvfs_get_utilisation());
ret += snprintf(buf + ret, PAGE_SIZE - ret, "mali DVFS is on\nutilisation:%d\ncurrent clock:%dMhz", kbase_platform_dvfs_get_utilisation(),clkrate/1000000);
else
ret += snprintf(buf + ret, PAGE_SIZE - ret, "mali DVFS is off");
ret += snprintf(buf + ret, PAGE_SIZE - ret, "mali DVFS is off,clock:%dMhz",clkrate/1000000);
#else
ret += snprintf(buf + ret, PAGE_SIZE - ret, "mali DVFS is disabled");
#endif