MLK-22768 video: fbdev: mxc_ipuv3_fb: Handle enabled fg properly when set-par happens...

When we do set-par for background framebuffer without on-the-fly
flag being set, we should also unset the enabled overlay framebuffer's
on-the-fly flag, otherwise the overlay framebuffer cannot be enabled
again properly because a full mode set procedure is needed for overlay
framebuffer as it experiences a period of time when background
framebuffer stops fetching frames.

Signed-off-by: Liu Ying <victor.liu@nxp.com>
(cherry picked from commit fad9437d99ae234f1c66087d47ad8a547f5f1142)

diff --git a/drivers/video/fbdev/mxc/mxc_ipuv3_fb.c b/drivers/video/fbdev/mxc/mxc_ipuv3_fb.c
index c6001b6..f2055d5 100644 (file)
--- a/drivers/video/fbdev/mxc/mxc_ipuv3_fb.c
+++ b/drivers/video/fbdev/mxc/mxc_ipuv3_fb.c
@@ -2,6 +2,8 @@
  * Copyright 2004-2016 Freescale Semiconductor, Inc. All Rights Reserved.
  */
 
+/* Copyright 2019 NXP */
+
 /*
  * The code contained herein is licensed under the GNU General Public
  * License. You may obtain a copy of the GNU General Public License
@@ -1353,6 +1355,7 @@ static int mxcfb_set_par(struct fb_info *fbi)
                        ipu_disp_set_window_pos(
                                        mxc_fbi_fg->ipu, mxc_fbi_fg->ipu_ch,
                                        ov_pos_x, ov_pos_y);
+               mxc_fbi_fg->on_the_fly = false;
                retval = _setup_disp_channel2(mxc_fbi->ovfbi);
                if (retval) {
                        ipu_uninit_channel(mxc_fbi_fg->ipu, mxc_fbi_fg->ipu_ch);