From: Mark Yao Date: Mon, 19 Jan 2015 04:33:48 +0000 (+0800) Subject: rk_fb: DSP_INFO use xact/yact when win not support scale X-Git-Tag: firefly_0821_release~4288 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=eeaef47c7f600afceee83cbc84237f74306b1097;p=firefly-linux-kernel-4.4.55.git rk_fb: DSP_INFO use xact/yact when win not support scale xact/yact means display buffer size, if use xsize/ysize, maybe out of buffer size range, that would cause iommu crash. Signed-off-by: Mark Yao --- diff --git a/drivers/video/rockchip/lcdc/rk312x_lcdc.c b/drivers/video/rockchip/lcdc/rk312x_lcdc.c index 9a04675a8b4e..38c29f883fec 100755 --- a/drivers/video/rockchip/lcdc/rk312x_lcdc.c +++ b/drivers/video/rockchip/lcdc/rk312x_lcdc.c @@ -470,8 +470,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].xsize) | - v_DSP_HEIGHT(win->area[0].ysize)); + v_DSP_WIDTH(win->area[0].xact) | + v_DSP_HEIGHT(win->area[0].yact)); lcdc_writel(lcdc_dev, WIN1_DSP_ST_RK312X, v_DSP_STX(win->area[0].dsp_stx) | v_DSP_STY(win->area[0].dsp_sty));