1 files changed, 15 insertions, 0 deletions

diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
index 5199a1febc01..2393e6d16ffd 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
@@ -98,6 +98,10 @@ 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)
@@ -115,11 +119,21 @@ 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,
@@ -234,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);