From 7d2b052260ae8258d90a97babbd85c6c03b96689 Mon Sep 17 00:00:00 2001 From: hjc Date: Mon, 23 Mar 2015 16:08:43 +0800 Subject: [PATCH] rk fb: only use iommu need to check config Signed-off-by: hjc --- drivers/video/rockchip/rk_fb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c index 430476c54c8f..ff947ac5666b 100644 --- a/drivers/video/rockchip/rk_fb.c +++ b/drivers/video/rockchip/rk_fb.c @@ -2011,7 +2011,8 @@ static int rk_fb_set_win_buffer(struct fb_info *info, if ((fb_data_fmt != YUV420) && (fb_data_fmt != YUV420_NV21) && (fb_data_fmt != YUV422) && - (fb_data_fmt != YUV444)) { + (fb_data_fmt != YUV444) && + dev_drv->iommu_enabled) { buff_len = reg_win_data->reg_area_data[i].y_offset + reg_win_data->reg_area_data[i].xvir * reg_win_data->reg_area_data[i].yact * @@ -2105,7 +2106,8 @@ static int rk_fb_set_win_buffer(struct fb_info *info, reg_win_data->reg_area_data[0].smem_start - reg_win_data->reg_area_data[0].xoff* pixel_width / 16 ; - if (buff_len > reg_win_data->reg_area_data[0].buff_len) + if ((buff_len > reg_win_data->reg_area_data[0].buff_len) && + dev_drv->iommu_enabled) pr_err("\n!!!!!!error: fmt=%d,xvir[%d]*" "yact[%d]*bpp[%d]" "=buff_len[0x%x]>>mmu len=0x%x\n", -- 2.34.1