drm/fb_helper: move deferred fb checking into restore mode (v2)

commit e2809c7db818df6bbd0edf843e1beb2fbc9d8541 upstream.

On MST systems the monitors don't appear when we set the fb up,
but plymouth opens the drm device and holds it open while they
come up, when plymouth finishes and lastclose gets called we
don't do the delayed fb probe, so the monitor never appears on the
console.

Fix this by moving the delayed checking into the mode restore.

v2: Daniel suggested that ->delayed_hotplug is set under
the mode_config mutex, so we should check it under that as
well, while we are in the area.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 0c0c39bac23da21a368ef94681da10b173994660..ef757f712a3d8837cb3ec3a5501354246ecaa986 100644 (file)
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -347,9 +347,18 @@ bool drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper)
 {
        struct drm_device *dev = fb_helper->dev;
        bool ret;
+       bool do_delayed = false;
+
        drm_modeset_lock_all(dev);
        ret = restore_fbdev_mode(fb_helper);
+
+       do_delayed = fb_helper->delayed_hotplug;
+       if (do_delayed)
+               fb_helper->delayed_hotplug = false;
        drm_modeset_unlock_all(dev);
+
+       if (do_delayed)
+               drm_fb_helper_hotplug_event(fb_helper);
        return ret;
 }
 EXPORT_SYMBOL(drm_fb_helper_restore_fbdev_mode_unlocked);
@@ -888,10 +897,6 @@ int drm_fb_helper_set_par(struct fb_info *info)
 
        drm_fb_helper_restore_fbdev_mode_unlocked(fb_helper);
 
-       if (fb_helper->delayed_hotplug) {
-               fb_helper->delayed_hotplug = false;
-               drm_fb_helper_hotplug_event(fb_helper);
-       }
        return 0;
 }
 EXPORT_SYMBOL(drm_fb_helper_set_par);