2 files changed, 74 insertions, 19 deletions

diff --git a/drivers/gpu/drm/mxsfb/mxsfb_crtc.c b/drivers/gpu/drm/mxsfb/mxsfb_crtc.c
index 0abe77675b76..24b1f0c1432e 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_crtc.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_crtc.c
@@ -129,7 +129,6 @@ static void mxsfb_enable_controller(struct mxsfb_drm_private *mxsfb)
         if (mxsfb->clk_disp_axi)
                 clk_prepare_enable(mxsfb->clk_disp_axi);
         clk_prepare_enable(mxsfb->clk);
-        mxsfb_enable_axi_clk(mxsfb);
 
         /* If it was disabled, re-enable the mode again */
         writel(CTRL_DOTCLK_MODE, mxsfb->base + LCDC_CTRL + REG_SET);
@@ -159,8 +158,6 @@ static void mxsfb_disable_controller(struct mxsfb_drm_private *mxsfb)
         reg &= ~VDCTRL4_SYNC_SIGNALS_ON;
         writel(reg, mxsfb->base + LCDC_VDCTRL4);
 
-        mxsfb_disable_axi_clk(mxsfb);
-
         clk_disable_unprepare(mxsfb->clk);
         if (mxsfb->clk_disp_axi)
                 clk_disable_unprepare(mxsfb->clk_disp_axi);
@@ -196,6 +193,21 @@ static int mxsfb_reset_block(void __iomem *reset_addr)
         return clear_poll_bit(reset_addr, MODULE_CLKGATE);
 }
 
+static dma_addr_t mxsfb_get_fb_paddr(struct mxsfb_drm_private *mxsfb)
+{
+        struct drm_framebuffer *fb = mxsfb->pipe.plane.state->fb;
+        struct drm_gem_cma_object *gem;
+
+        if (!fb)
+                return 0;
+
+        gem = drm_fb_cma_get_gem_obj(fb, 0);
+        if (!gem)
+                return 0;
+
+        return gem->paddr;
+}
+
 static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb)
 {
         struct drm_display_mode *m = &mxsfb->pipe.crtc.state->adjusted_mode;
@@ -208,7 +220,6 @@ static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb)
          * running. This may lead to shifted pictures (FIFO issue?), so
          * first stop the controller and drain its FIFOs.
          */
-        mxsfb_enable_axi_clk(mxsfb);
 
         /* Mandatory eLCDIF reset as per the Reference Manual */
         err = mxsfb_reset_block(mxsfb->base);
@@ -269,19 +280,29 @@ static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb)
 
         writel(SET_DOTCLK_H_VALID_DATA_CNT(m->hdisplay),
                mxsfb->base + LCDC_VDCTRL4);
-
-        mxsfb_disable_axi_clk(mxsfb);
 }
 
 void mxsfb_crtc_enable(struct mxsfb_drm_private *mxsfb)
 {
+        dma_addr_t paddr;
+
+        mxsfb_enable_axi_clk(mxsfb);
         mxsfb_crtc_mode_set_nofb(mxsfb);
+
+        /* Write cur_buf as well to avoid an initial corrupt frame */
+        paddr = mxsfb_get_fb_paddr(mxsfb);
+        if (paddr) {
+                writel(paddr, mxsfb->base + mxsfb->devdata->cur_buf);
+                writel(paddr, mxsfb->base + mxsfb->devdata->next_buf);
+        }
+
         mxsfb_enable_controller(mxsfb);
 }
 
 void mxsfb_crtc_disable(struct mxsfb_drm_private *mxsfb)
 {
         mxsfb_disable_controller(mxsfb);
+        mxsfb_disable_axi_clk(mxsfb);
 }
 
 void mxsfb_plane_atomic_update(struct mxsfb_drm_private *mxsfb,
@@ -289,12 +310,8 @@ void mxsfb_plane_atomic_update(struct mxsfb_drm_private *mxsfb,
 {
         struct drm_simple_display_pipe *pipe = &mxsfb->pipe;
         struct drm_crtc *crtc = &pipe->crtc;
-        struct drm_framebuffer *fb = pipe->plane.state->fb;
         struct drm_pending_vblank_event *event;
-        struct drm_gem_cma_object *gem;
-
-        if (!crtc)
-                return;
+        dma_addr_t paddr;
 
         spin_lock_irq(&crtc->dev->event_lock);
         event = crtc->state->event;
@@ -309,12 +326,10 @@ void mxsfb_plane_atomic_update(struct mxsfb_drm_private *mxsfb,
         }
         spin_unlock_irq(&crtc->dev->event_lock);
 
-        if (!fb)
-                return;
-
-        gem = drm_fb_cma_get_gem_obj(fb, 0);
-
-        mxsfb_enable_axi_clk(mxsfb);
-        writel(gem->paddr, mxsfb->base + mxsfb->devdata->next_buf);
-        mxsfb_disable_axi_clk(mxsfb);
+        paddr = mxsfb_get_fb_paddr(mxsfb);
+        if (paddr) {
+                mxsfb_enable_axi_clk(mxsfb);
+                writel(paddr, mxsfb->base + mxsfb->devdata->next_buf);
+                mxsfb_disable_axi_clk(mxsfb);
+        }
 }
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
index ffe5137ccaf8..2393e6d16ffd 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
@@ -98,12 +98,18 @@ static const struct drm_mode_config_funcs mxsfb_mode_config_funcs = {
         .atomic_commit          = drm_atomic_helper_commit,
 };
 
+static const struct drm_mode_config_helper_funcs mxsfb_mode_config_helpers = {
+        .atomic_commit_tail = drm_atomic_helper_commit_tail_rpm,
+};
+
 static void mxsfb_pipe_enable(struct drm_simple_display_pipe *pipe,
                               struct drm_crtc_state *crtc_state,
                               struct drm_plane_state *plane_state)
 {
         struct mxsfb_drm_private *mxsfb = drm_pipe_to_mxsfb_drm_private(pipe);
+        struct drm_device *drm = pipe->plane.dev;
 
+        pm_runtime_get_sync(drm->dev);
         drm_panel_prepare(mxsfb->panel);
         mxsfb_crtc_enable(mxsfb);
         drm_panel_enable(mxsfb->panel);
@@ -112,10 +118,22 @@ static void mxsfb_pipe_enable(struct drm_simple_display_pipe *pipe,
 static void mxsfb_pipe_disable(struct drm_simple_display_pipe *pipe)
 {
         struct mxsfb_drm_private *mxsfb = drm_pipe_to_mxsfb_drm_private(pipe);
+        struct drm_device *drm = pipe->plane.dev;
+        struct drm_crtc *crtc = &pipe->crtc;
+        struct drm_pending_vblank_event *event;
 
         drm_panel_disable(mxsfb->panel);
         mxsfb_crtc_disable(mxsfb);
         drm_panel_unprepare(mxsfb->panel);
+        pm_runtime_put_sync(drm->dev);
+
+        spin_lock_irq(&drm->event_lock);
+        event = crtc->state->event;
+        if (event) {
+                crtc->state->event = NULL;
+                drm_crtc_send_vblank_event(crtc, event);
+        }
+        spin_unlock_irq(&drm->event_lock);
 }
 
 static void mxsfb_pipe_update(struct drm_simple_display_pipe *pipe,
@@ -230,6 +248,7 @@ static int mxsfb_load(struct drm_device *drm, unsigned long flags)
         drm->mode_config.max_width      = MXSFB_MAX_XRES;
         drm->mode_config.max_height     = MXSFB_MAX_YRES;
         drm->mode_config.funcs          = &mxsfb_mode_config_funcs;
+        drm->mode_config.helper_private = &mxsfb_mode_config_helpers;
 
         drm_mode_config_reset(drm);
 
@@ -414,6 +433,26 @@ static int mxsfb_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int mxsfb_suspend(struct device *dev)
+{
+        struct drm_device *drm = dev_get_drvdata(dev);
+
+        return drm_mode_config_helper_suspend(drm);
+}
+
+static int mxsfb_resume(struct device *dev)
+{
+        struct drm_device *drm = dev_get_drvdata(dev);
+
+        return drm_mode_config_helper_resume(drm);
+}
+#endif
+
+static const struct dev_pm_ops mxsfb_pm_ops = {
+        SET_SYSTEM_SLEEP_PM_OPS(mxsfb_suspend, mxsfb_resume)
+};
+
 static struct platform_driver mxsfb_platform_driver = {
         .probe          = mxsfb_probe,
         .remove         = mxsfb_remove,
@@ -421,6 +460,7 @@ static struct platform_driver mxsfb_platform_driver = {
         .driver = {
                 .name           = "mxsfb",
                 .of_match_table = mxsfb_dt_ids,
+                .pm             = &mxsfb_pm_ops,
         },
 };