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

ddrfreq: complete(&vop_req_completion) must be called after ddrfreq_work is done when VOP_REQ_BLOCK is defined

Browse Source 
Signed-off-by: cl <cl@rock-chips.com>
This commit is contained in:
cl
2015-01-06 20:54:14 +08:00
parent f7fc5a6f9b
commit f67f271a85
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/mach-rockchip/ddr_freq.c
View File

@@ -67,7 +67,7 @@ enum {
DEBUG_SUSPEND = 1U << 2,
DEBUG_VERBOSE = 1U << 3,
};
static int debug_mask = DEBUG_DDR;
static int debug_mask;
module_param(debug_mask, int, S_IRUGO | S_IWUSR | S_IWGRP);
#define dprintk(mask, fmt, ...) do { if (mask & debug_mask) pr_debug(fmt, ##__VA_ARGS__); } while (0)
@@ -432,17 +432,15 @@ static int ddrfreq_task(void *data)
do {
status = ddr.sys_status;
timeout = ddrfreq_work(status);
if (old_status != status)
complete(&ddrfreq_completion);
if (vop_bandwidth_update_flag) {
vop_bandwidth_update_flag = 0;
#ifdef VOP_REQ_BLOCK
complete(&vop_req_completion);
#endif
}
timeout = ddrfreq_work(status);
if (old_status != status) {
complete(&ddrfreq_completion);
}
wait_event_freezable_timeout(ddr.wait, vop_bandwidth_update_flag || (status != ddr.sys_status) || kthread_should_stop(), timeout);
old_status = status;
} while (!kthread_should_stop());
@@ -636,14 +634,15 @@ static long ddr_freq_ioctl(struct file *file, unsigned int cmd, unsigned long ar
vop_bandwidth = bpvinfo->bp_vop_size;
vop_bandwidth_update_jiffies = jiffies;
vop_req_freq = req_freq_by_vop(vop_bandwidth);
if (dvfs_clk_get_rate(ddr.clk_dvfs_node) >= vop_req_freq) {
if (dvfs_clk_get_rate(ddr.clk_dvfs_node) >= vop_req_freq)
ret = 0;
}
vop_bandwidth_update_flag = 1;
wake_up(&ddr.wait);
#ifdef VOP_REQ_BLOCK
wait_for_completion(&vop_req_completion);
if (dvfs_clk_get_rate(ddr.clk_dvfs_node) >= vop_req_freq)
ret = 0;
#endif
return ret;