MLK-14655-1 video: mxsfb: don't clear AS regs when overlay fb release
authorFancy Fang <chen.fang@nxp.com>
Mon, 10 Apr 2017 05:50:51 +0000 (13:50 +0800)
committerNitin Garg <nitin.garg@nxp.com>
Mon, 19 Mar 2018 20:21:52 +0000 (15:21 -0500)
Don't clear the 'LCDC_AS_CTRL' and 'LCDC_AS_NEXT_BUF' registers
in the function 'overlayfb_release()', since the next user may
enable overlay fb without calling set_par first.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit 167b1f430d2bb178d22f32f790d55b08352a6a87)

drivers/video/fbdev/mxsfb.c

index 3ba558e..c9da44f 100644 (file)
@@ -1717,7 +1717,6 @@ static int overlayfb_open(struct fb_info *info, int user)
 static int overlayfb_release(struct fb_info *info, int user)
 {
        struct mxsfb_layer *ofb = (struct mxsfb_layer*)info->par;
-       struct mxsfb_info *fbi = ofb->fbi;
 
        BUG_ON(!atomic_read(&ofb->usage));
 
@@ -1726,8 +1725,6 @@ static int overlayfb_release(struct fb_info *info, int user)
                        ofb->ops->disable(ofb);
 
                ofb->blank_state = -1;
-               writel(0x0, fbi->base + LCDC_AS_CTRL);
-               writel(0x0, fbi->base + LCDC_AS_NEXT_BUF);
        }
 
        return 0;