2 files changed, 19 insertions, 6 deletions

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index c6ce416ab58..0dff12a1dae 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1046,20 +1046,29 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
 int
 fb_blank(struct fb_info *info, int blank)
 {       
-        int ret = -EINVAL;
+        struct fb_event event;
+        int ret = -EINVAL, early_ret;
 
         if (blank > FB_BLANK_POWERDOWN)
                 blank = FB_BLANK_POWERDOWN;
 
+        event.info = info;
+        event.data = ␣
+
+        early_ret = fb_notifier_call_chain(FB_EARLY_EVENT_BLANK, &event);
+
         if (info->fbops->fb_blank)
                 ret = info->fbops->fb_blank(blank, info);
 
-        if (!ret) {
-                struct fb_event event;
-
-                event.info = info;
-                event.data = ␣
+        if (!ret)
                 fb_notifier_call_chain(FB_EVENT_BLANK, &event);
+        else {
+                /*
+                 * if fb_blank is failed then revert effects of
+                 * the early blank event.
+                 */
+                if (!early_ret)
+                        fb_notifier_call_chain(FB_R_EARLY_EVENT_BLANK, &event);
         }
 
         return ret;
diff --git a/include/linux/fb.h b/include/linux/fb.h
index d31cb682e17..a3229d7ab9f 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -554,6 +554,10 @@ struct fb_cursor_user {
 #define FB_EVENT_FB_UNBIND              0x0E
 /*      CONSOLE-SPECIFIC: remap all consoles to new fb - for vga switcheroo */
 #define FB_EVENT_REMAP_ALL_CONSOLE      0x0F
+/*      A hardware display blank early change occured */
+#define FB_EARLY_EVENT_BLANK            0x10
+/*      A hardware display blank revert early change occured */
+#define FB_R_EARLY_EVENT_BLANK          0x11
 
 struct fb_event {
         struct fb_info *info;