#define MSM_VERSION_MINOR      3
 #define MSM_VERSION_PATCHLEVEL 0
 
-static void msm_fb_output_poll_changed(struct drm_device *dev)
-{
-       struct msm_drm_private *priv = dev->dev_private;
-       if (priv->fbdev)
-               drm_fb_helper_hotplug_event(priv->fbdev);
-}
-
 static const struct drm_mode_config_funcs mode_config_funcs = {
        .fb_create = msm_framebuffer_create,
-       .output_poll_changed = msm_fb_output_poll_changed,
+       .output_poll_changed = drm_fb_helper_output_poll_changed,
        .atomic_check = drm_atomic_helper_check,
        .atomic_commit = msm_atomic_commit,
        .atomic_state_alloc = msm_atomic_state_alloc,
        context_close(ctx);
 }
 
-static void msm_lastclose(struct drm_device *dev)
-{
-       struct msm_drm_private *priv = dev->dev_private;
-       if (priv->fbdev)
-               drm_fb_helper_restore_fbdev_mode_unlocked(priv->fbdev);
-}
-
 static irqreturn_t msm_irq(int irq, void *arg)
 {
        struct drm_device *dev = arg;
                                DRIVER_MODESET,
        .open               = msm_open,
        .postclose           = msm_postclose,
-       .lastclose          = msm_lastclose,
+       .lastclose          = drm_fb_helper_lastclose,
        .irq_handler        = msm_irq,
        .irq_preinstall     = msm_irq_preinstall,
        .irq_postinstall    = msm_irq_postinstall,