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

rk lcdc: if win not support scale, make sure dsp size equal to act size

Browse Source 
Signed-off-by: hjc <hjc@rock-chips.com>
This commit is contained in:
hjc
2015-03-09 11:34:40 +08:00
parent a9f4a0639d
commit b4c7e9fd09
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/video/rockchip/lcdc/rk312x_lcdc.c
View File

@@ -472,8 +472,8 @@ static void lcdc_layer_update_regs(struct lcdc_device *lcdc_dev,
WIN1_MST, win->area[0].y_addr);
} else {
lcdc_writel(lcdc_dev, WIN1_DSP_INFO_RK312X,
v_DSP_WIDTH(win->area[0].xact) |
v_DSP_HEIGHT(win->area[0].yact));
v_DSP_WIDTH(win->area[0].xsize) |
v_DSP_HEIGHT(win->area[0].ysize));
lcdc_writel(lcdc_dev, WIN1_DSP_ST_RK312X,
v_DSP_STX(win->area[0].dsp_stx) |
v_DSP_STY(win->area[0].dsp_sty));
@@ -1516,6 +1516,17 @@ static int rk312x_lcdc_set_par(struct rk_lcdc_driver *dev_drv, int win_id)
spin_lock(&lcdc_dev->reg_lock);
win->area[0].dsp_stx = win->area[0].xpos + screen->mode.left_margin +
screen->mode.hsync_len;
if (win_id == 1) {
if ((win->area[0].xact != win->area[0].xsize) ||
(win->area[0].yact != win->area[0].ysize)) {
pr_err("win[1],not support scale\n");
pr_err("xact=%d,yact=%d,xsize=%d,ysize=%d\n",
win->area[0].xact,win->area[0].yact,
win->area[0].xsize,win->area[0].ysize);
win->area[0].xsize = win->area[0].xact;
win->area[0].ysize = win->area[0].yact;
}
}
if (screen->mode.vmode == FB_VMODE_INTERLACED) {
win->area[0].ysize /= 2;
win->area[0].dsp_sty = win->area[0].ypos / 2 +

20
drivers/video/rockchip/lcdc/rk3288_lcdc.c
View File

@@ -2282,6 +2282,16 @@ static int win2_set_par(struct lcdc_device *lcdc_dev,
screen->mode.upper_margin +
screen->mode.vsync_len;
}
if ((win->area[i].xact != win->area[i].xsize) ||
(win->area[i].yact != win->area[i].ysize)) {
pr_err("win[%d]->area[%d],not support scale\n",
win->id, i);
pr_err("xact=%d,yact=%d,xsize=%d,ysize=%d\n",
win->area[i].xact,win->area[i].yact,
win->area[i].xsize,win->area[i].ysize);
win->area[i].xsize = win->area[i].xact;
win->area[i].ysize = win->area[i].yact;
}
}
}
rk3288_win_2_3_reg_update(&lcdc_dev->driver,2);
@@ -2340,6 +2350,16 @@ static int win3_set_par(struct lcdc_device *lcdc_dev,
screen->mode.vsync_len;
}
}
if ((win->area[i].xact != win->area[i].xsize) ||
(win->area[i].yact != win->area[i].ysize)) {
pr_err("win[%d]->area[%d],not support scale\n",
win->id, i);
pr_err("xact=%d,yact=%d,xsize=%d,ysize=%d\n",
win->area[i].xact,win->area[i].yact,
win->area[i].xsize,win->area[i].ysize);
win->area[i].xsize = win->area[i].xact;
win->area[i].ysize = win->area[i].yact;
}
}
rk3288_win_2_3_reg_update(&lcdc_dev->driver,3);
spin_unlock(&lcdc_dev->reg_lock);