fb: Yet another band-aid for fixing lockdep mess

I've still got lockdep warnings even after Alan's patch, and it seems that
yet more band aids are required to paper over similar paths for
unbind_con_driver() and unregister_con_driver().  After this hack, lockdep
warnings are finally gone.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: stable <stable@vger.kernel.org>
Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

2 files changed, 6 insertions, 2 deletions

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 4bd7820cf4d0..2aef9cac4d18 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -3004,7 +3004,7 @@ static int fbcon_unbind(void)
 {
         int ret;
 
-        ret = unbind_con_driver(&fb_con, first_fb_vc, last_fb_vc,
+        ret = do_unbind_con_driver(&fb_con, first_fb_vc, last_fb_vc,
                                 fbcon_is_default);
 
         if (!ret)
@@ -3077,7 +3077,7 @@ static int fbcon_fb_unregistered(struct fb_info *info)
                 primary_device = -1;
 
         if (!num_registered_fb)
-                unregister_con_driver(&fb_con);
+                do_unregister_con_driver(&fb_con);
 
         return 0;
 }
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index d8d9831b3fdb..070b9a13d892 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1668,8 +1668,10 @@ static int do_unregister_framebuffer(struct fb_info *fb_info)
 
         if (!lock_fb_info(fb_info))
                 return -ENODEV;
+        console_lock();
         event.info = fb_info;
         ret = fb_notifier_call_chain(FB_EVENT_FB_UNBIND, &event);
+        console_unlock();
         unlock_fb_info(fb_info);
 
         if (ret)
@@ -1684,7 +1686,9 @@ static int do_unregister_framebuffer(struct fb_info *fb_info)
         num_registered_fb--;
         fb_cleanup_device(fb_info);
         event.info = fb_info;
+        console_lock();
         fb_notifier_call_chain(FB_EVENT_FB_UNREGISTERED, &event);
+        console_unlock();
 
         /* this may free fb info */
         put_fb_info(fb_info);