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

rk fb: modify acq_fence wait

Browse Source
This commit is contained in:
zwl
2014-05-30 11:43:33 +08:00
parent 5e3bcd307b
commit b2d2fbd665
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/video/rockchip/rk_fb.c
View File

@@ -1408,6 +1408,18 @@ static void rk_fb_update_reg(struct rk_lcdc_driver *dev_drv,
int count = 100;
unsigned int dsp_addr[4];
long timeout;
/* acq_fence wait */
for (i = 0; i < regs->win_num; i++) {
win_data = &regs->reg_win_data[i];
for (j = 0; j < RK_WIN_MAX_AREA; j++) {
if (win_data->reg_area_data[j].acq_fence) {
/* printk("acq_fence wait!!!!!\n"); */
rk_fd_fence_wait(dev_drv, win_data->reg_area_data[j].acq_fence);
}
}
}
for (i = 0; i < dev_drv->lcdc_win_num; i++) {
win = dev_drv->win[i];
win_data = rk_fb_get_win_data(regs, i);
@@ -1824,7 +1836,6 @@ static int rk_fb_set_win_config(struct fb_info *info,
{
struct rk_lcdc_driver *dev_drv = (struct rk_lcdc_driver *)info->par;
struct rk_fb_reg_data *regs;
struct rk_fb_reg_win_data *reg_win_data;
#ifdef H_USE_FENCE
struct sync_fence *release_fence[RK_MAX_BUF_NUM];
struct sync_fence *retire_fence;
@@ -1864,15 +1875,6 @@ static int rk_fb_set_win_config(struct fb_info *info,
win_data->win_par[i].win_id);
}
}
for (i = 0; i < regs->win_num; i++) {
reg_win_data = &regs->reg_win_data[i];
for (j = 0; j < RK_WIN_MAX_AREA; j++) {
if (reg_win_data->reg_area_data[j].acq_fence) {
/* printk("acq_fence wait!!!!!\n"); */
rk_fd_fence_wait(dev_drv, reg_win_data->reg_area_data[j].acq_fence);
}
}
}
mutex_lock(&dev_drv->output_lock);
if (!(dev_drv->suspend_flag == 0)) {