fbcon: Block rounding off mode for VT running X.

[hercules2020/nv-tegra/linux-4.4.git] / drivers / video / console / fbcon.c

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index f889b5e1fbca32236bdf068622bf0110bb75933f..e6162922b64a7e7969117f40c2dbb68d382f5247 100644 (file)
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -3205,11 +3205,13 @@ static void fbcon_new_modelist(struct fb_info *info)
                if (!fb_display[i].mode)
                        continue;
                vc = vc_cons[i].d;
-               display_to_var(&var, &fb_display[i]);
-               mode = fb_find_nearest_mode(fb_display[i].mode,
+               if (vc->vc_mode == KD_TEXT) {
+                       display_to_var(&var, &fb_display[i]);
+                       mode = fb_find_nearest_mode(fb_display[i].mode,
                                            &info->modelist);
-               fb_videomode_to_var(&var, mode);
-               fbcon_set_disp(info, &var, vc->vc_num);
+                       fb_videomode_to_var(&var, mode);
+                       fbcon_set_disp(info, &var, vc->vc_num);
+               }
        }
 }