From e94f1ce13d0ca3b0ecbeca8cf2614f40b436f150 Mon Sep 17 00:00:00 2001 From: ChiHun Won Date: Fri, 25 May 2018 16:40:33 +0900 Subject: [PATCH] fbdev: dpu20: fixed decon pan display DMA2CH mapping error Change-Id: I6c176d68c6104f1ac9cfa237223088e2d519698d Signed-off-by: ChiHun Won --- drivers/video/fbdev/exynos/dpu20/decon_dsi.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/video/fbdev/exynos/dpu20/decon_dsi.c b/drivers/video/fbdev/exynos/dpu20/decon_dsi.c index aafd57d91386..328687c04bae 100644 --- a/drivers/video/fbdev/exynos/dpu20/decon_dsi.c +++ b/drivers/video/fbdev/exynos/dpu20/decon_dsi.c @@ -657,6 +657,7 @@ int decon_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) struct decon_win_config config; int ret = 0; struct decon_mode_info psr; + int dpp_id = DPU_DMA2CH(decon->dt.dft_idma); if (decon->dt.out_type != DECON_OUT_DSI) { decon_warn("%s: decon%d unspported on out_type(%d)\n", @@ -671,7 +672,7 @@ int decon_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) return 0; } - decon_dbg("%s: [%d %d %d %d %d %d]\n", __func__, + decon_info("%s: [%d %d %d %d %d %d]\n", __func__, var->xoffset, var->yoffset, var->xres, var->yres, var->xres_virtual, var->yres_virtual); @@ -719,14 +720,14 @@ int decon_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) */ memcpy(&info->var, var, sizeof(struct fb_var_screeninfo)); - set_bit(decon->dt.dft_idma, &decon->cur_using_dpp); - set_bit(decon->dt.dft_idma, &decon->prev_used_dpp); - sd = decon->dpp_sd[decon->dt.dft_idma]; + set_bit(dpp_id, &decon->cur_using_dpp); + set_bit(dpp_id, &decon->prev_used_dpp); + sd = decon->dpp_sd[dpp_id]; if (v4l2_subdev_call(sd, core, ioctl, DPP_WIN_CONFIG, &config)) { decon_err("%s: Failed to config DPP-%d\n", __func__, win->dpp_id); decon_reg_win_enable_and_update(decon->id, decon->dt.dft_win, false); - clear_bit(decon->dt.dft_idma, &decon->cur_using_dpp); - set_bit(decon->dt.dft_idma, &decon->dpp_err_stat); + clear_bit(dpp_id, &decon->cur_using_dpp); + set_bit(dpp_id, &decon->dpp_err_stat); goto err; } -- 2.20.1