3 files changed, 66 insertions, 4 deletions

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 9b66331020dd..decfdc8eb9cc 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -3003,6 +3003,45 @@ static int fbcon_mode_deleted(struct fb_info *info,
         return found;
 }
 
+#ifdef CONFIG_VT_HW_CONSOLE_BINDING
+static int fbcon_unbind(void)
+{
+        int ret;
+
+        ret = unbind_con_driver(&fb_con, first_fb_vc, last_fb_vc,
+                                fbcon_is_default);
+        return ret;
+}
+#else
+static inline int fbcon_unbind(void)
+{
+        return -EINVAL;
+}
+#endif /* CONFIG_VT_HW_CONSOLE_BINDING */
+
+static int fbcon_fb_unbind(int idx)
+{
+        int i, new_idx = -1, ret = 0;
+
+        for (i = first_fb_vc; i <= last_fb_vc; i++) {
+                if (con2fb_map[i] != idx &&
+                    con2fb_map[i] != -1) {
+                        new_idx = i;
+                        break;
+                }
+        }
+
+        if (new_idx != -1) {
+                for (i = first_fb_vc; i <= last_fb_vc; i++) {
+                        if (con2fb_map[i] == idx)
+                                set_con2fb_map(i, new_idx, 0);
+                }
+        } else
+                ret = fbcon_unbind();
+
+        return ret;
+}
+
 static int fbcon_fb_unregistered(struct fb_info *info)
 {
         int i, idx = info->node;
@@ -3210,6 +3249,9 @@ static int fbcon_event_notify(struct notifier_block *self,
                 mode = event->data;
                 ret = fbcon_mode_deleted(info, mode);
                 break;
+        case FB_EVENT_FB_UNBIND:
+                ret = fbcon_fb_unbind(info->node);
+                break;
         case FB_EVENT_FB_REGISTERED:
                 ret = fbcon_fb_registered(info);
                 break;
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 8d6dbe8b8dd1..7f3a0cca0fd4 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1334,17 +1334,34 @@ register_framebuffer(struct fb_info *fb_info)
  *
  *      Returns negative errno on error, or zero for success.
  *
+ *      This function will also notify the framebuffer console
+ *      to release the driver.
+ *
+ *      This is meant to be called within a driver's module_exit()
+ *      function. If this is called outside module_exit(), ensure
+ *      that the driver implements fb_open() and fb_release() to
+ *      check that no processes are using the device.
  */
 
 int
 unregister_framebuffer(struct fb_info *fb_info)
 {
         struct fb_event event;
-        int i;
+        int i, ret = 0;
 
         i = fb_info->node;
-        if (!registered_fb[i])
-                return -EINVAL;
+        if (!registered_fb[i]) {
+                ret = -EINVAL;
+                goto done;
+        }
+
+        event.info = fb_info;
+        ret = fb_notifier_call_chain(FB_EVENT_FB_UNBIND, &event);
+
+        if (ret) {
+                ret = -EINVAL;
+                goto done;
+        }
 
         if (fb_info->pixmap.addr &&
             (fb_info->pixmap.flags & FB_PIXMAP_DEFAULT))
@@ -1356,7 +1373,8 @@ unregister_framebuffer(struct fb_info *fb_info)
         device_destroy(fb_class, MKDEV(FB_MAJOR, i));
         event.info = fb_info;
         fb_notifier_call_chain(FB_EVENT_FB_UNREGISTERED, &event);
-        return 0;
+done:
+        return ret;
 }
 
 /**
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 66226824ab68..8628423c6dd3 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -529,6 +529,8 @@ struct fb_cursor_user {
 #define FB_EVENT_CONBLANK               0x0C
 /*      Get drawing requirements        */
 #define FB_EVENT_GET_REQ                0x0D
+/*      Unbind from the console if possible */
+#define FB_EVENT_FB_UNBIND              0x0E
 
 struct fb_event {
         struct fb_info *info;