From 81d55760e89a6cdf9aae3bc6ee70db4579017b00 Mon Sep 17 00:00:00 2001 From: Troy Kisky Date: Mon, 26 Sep 2016 17:44:11 -0700 Subject: mxc_ipuv3_fb: clear frame buffer when line length changes Signed-off-by: Troy Kisky (cherry picked from commit 8a2973e535e27e6f3404b23535f393ac1dd3a3ab) Related to #47541 Signed-off-by: Max Krummenacher --- drivers/video/fbdev/mxc/mxc_ipuv3_fb.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/video/fbdev/mxc/mxc_ipuv3_fb.c b/drivers/video/fbdev/mxc/mxc_ipuv3_fb.c index 926990316639..50b4f31bc536 100644 --- a/drivers/video/fbdev/mxc/mxc_ipuv3_fb.c +++ b/drivers/video/fbdev/mxc/mxc_ipuv3_fb.c @@ -1120,6 +1120,7 @@ static int mxcfb_set_par(struct fb_info *fbi) int ov_pos_ret = 0; struct mxcfb_info *mxc_fbi_fg = NULL; bool ovfbi_enable = false, on_the_fly; + int prev_line_length; if (ipu_ch_param_bad_alpha_pos(fbi_to_pixfmt(fbi, true)) && mxc_fbi->alpha_chan_en) { @@ -1143,6 +1144,7 @@ static int mxcfb_set_par(struct fb_info *fbi) if (fbi->var.xres == 0 || fbi->var.yres == 0) return 0; + prev_line_length = fbi->fix.line_length; mxcfb_set_fix(fbi); mxcfb_check_resolve(fbi); @@ -1214,6 +1216,11 @@ static int mxcfb_set_par(struct fb_info *fbi) if (mxcfb_map_video_memory(fbi) < 0) return -ENOMEM; + } else { + if (prev_line_length && (prev_line_length != fbi->fix.line_length)) { + memset((char *)fbi->screen_base, 0, fbi->fix.smem_len); + mxc_fbi->first_set_par = false; + } } if (mxc_fbi->first_set_par) { -- cgit v1.2.3