2 files changed, 14 insertions, 1 deletions

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 8068d2f7efe6..3660e51b2612 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -2103,7 +2103,8 @@ static int fbcon_switch(struct vc_data *vc)
         fb_set_var(info, &var);
         ops->var = info->var;
 
-        if (old_info != NULL && old_info != info) {
+        if (old_info != NULL && (old_info != info ||
+                                 info->flags & FBINFO_MISC_ALWAYS_SETPAR)) {
                 if (info->fbops->fb_set_par)
                         info->fbops->fb_set_par(info);
                 fbcon_del_cursor_timer(old_info);
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 55ccaf3706c1..dab3a4decb44 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -732,6 +732,18 @@ struct fb_tile_ops {
                                                   from userspace */
 #define FBINFO_MISC_TILEBLITTING       0x20000 /* use tile blitting */
 
+/* A driver may set this flag to indicate that it does want a set_par to be
+ * called every time when fbcon_switch is executed. The advantage is that with
+ * this flag set you can really be shure that set_par is always called before
+ * any of the functions dependant on the correct hardware state or altering
+ * that state, even if you are using some broken X releases. The disadvantage
+ * is that it introduces unwanted delays to every console switch if set_par
+ * is slow. It is a good idea to try this flag in the drivers initialization
+ * code whenever there is a bug report related to switching between X and the
+ * framebuffer console.
+ */
+#define FBINFO_MISC_ALWAYS_SETPAR   0x40000
+
 struct fb_info {
         int node;
         int flags;