[PATCH v3 1/4] drm: mxsfb: Wrap FIFO reset and comments into mxsfb_reset_block()

[Marek Vasut]

Wrap FIFO reset and comments into mxsfb_reset_block(), this is a clean up.
No functional change.

Reviewed-by: Lucas Stach <l.st...@pengutronix.de>
Signed-off-by: Marek Vasut <ma...@denx.de>
Cc: Alexander Stein <alexander.st...@ew.tq-group.com>
Cc: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
Cc: Lucas Stach <l.st...@pengutronix.de>
Cc: Peng Fan <peng....@nxp.com>
Cc: Robby Cai <robby....@nxp.com>
Cc: Sam Ravnborg <s...@ravnborg.org>
Cc: Stefan Agner <ste...@agner.ch>
---
V2: Add RB from Lucas
V3: Rebase on latest next and discarded clock and irq cleanups
---
 drivers/gpu/drm/mxsfb/mxsfb_kms.c | 36 +++++++++++++++++--------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/mxsfb/mxsfb_kms.c 
b/drivers/gpu/drm/mxsfb/mxsfb_kms.c
index 4cfb6c0016799..45cabe0960769 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_kms.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_kms.c
@@ -191,6 +191,12 @@ static int mxsfb_reset_block(struct mxsfb_drm_private 
*mxsfb)
 {
        int ret;
 
+       /*
+        * It seems, you can't re-program the controller if it is still
+        * running. This may lead to shifted pictures (FIFO issue?), so
+        * first stop the controller and drain its FIFOs.
+        */
+
        ret = clear_poll_bit(mxsfb->base + LCDC_CTRL, CTRL_SFTRST);
        if (ret)
                return ret;
@@ -201,7 +207,20 @@ static int mxsfb_reset_block(struct mxsfb_drm_private 
*mxsfb)
        if (ret)
                return ret;
 
-       return clear_poll_bit(mxsfb->base + LCDC_CTRL, CTRL_CLKGATE);
+       ret = clear_poll_bit(mxsfb->base + LCDC_CTRL, CTRL_CLKGATE);
+       if (ret)
+               return ret;
+
+       /* Clear the FIFOs */
+       writel(CTRL1_FIFO_CLEAR, mxsfb->base + LCDC_CTRL1 + REG_SET);
+       readl(mxsfb->base + LCDC_CTRL1);
+       writel(CTRL1_FIFO_CLEAR, mxsfb->base + LCDC_CTRL1 + REG_CLR);
+       readl(mxsfb->base + LCDC_CTRL1);
+
+       if (mxsfb->devdata->has_overlay)
+               writel(0, mxsfb->base + LCDC_AS_CTRL);
+
+       return 0;
 }
 
 static dma_addr_t mxsfb_get_fb_paddr(struct drm_plane *plane)
@@ -228,26 +247,11 @@ static void mxsfb_crtc_mode_set_nofb(struct 
mxsfb_drm_private *mxsfb,
        u32 vdctrl0, vsync_pulse_len, hsync_pulse_len;
        int err;
 
-       /*
-        * It seems, you can't re-program the controller if it is still
-        * running. This may lead to shifted pictures (FIFO issue?), so
-        * first stop the controller and drain its FIFOs.
-        */
-
        /* Mandatory eLCDIF reset as per the Reference Manual */
        err = mxsfb_reset_block(mxsfb);
        if (err)
                return;
 
-       /* Clear the FIFOs */
-       writel(CTRL1_FIFO_CLEAR, mxsfb->base + LCDC_CTRL1 + REG_SET);
-       readl(mxsfb->base + LCDC_CTRL1);
-       writel(CTRL1_FIFO_CLEAR, mxsfb->base + LCDC_CTRL1 + REG_CLR);
-       readl(mxsfb->base + LCDC_CTRL1);
-
-       if (mxsfb->devdata->has_overlay)
-               writel(0, mxsfb->base + LCDC_AS_CTRL);
-
        mxsfb_set_formats(mxsfb, bus_format);
 
        clk_set_rate(mxsfb->clk, m->crtc_clock * 1000);
-- 
2.35.1