Update from upstream with manual merge of Yasunori Goto's

changes to swiotlb.c made in commit 281dd25cdc0d6903929b79183816d151ea626341
since this file has been moved from arch/ia64/lib/swiotlb.c to
lib/swiotlb.c

Signed-off-by: Tony Luck <tony.luck@intel.com>

1 files changed, 10 insertions, 3 deletions

diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 0705cd741411..809fee2140ac 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -565,7 +565,11 @@ static int vgacon_switch(struct vc_data *c)
                 scr_memcpyw((u16 *) c->vc_origin, (u16 *) c->vc_screenbuf,
                             c->vc_screenbuf_size > vga_vram_size ?
                                 vga_vram_size : c->vc_screenbuf_size);
-                vgacon_doresize(c, c->vc_cols, c->vc_rows);
+                if (!(vga_video_num_columns % 2) &&
+                    vga_video_num_columns <= ORIG_VIDEO_COLS &&
+                    vga_video_num_lines <= (ORIG_VIDEO_LINES *
+                        vga_default_font_height) / c->vc_font.height)
+                        vgacon_doresize(c, c->vc_cols, c->vc_rows);
         }
 
         return 0;               /* Redrawing not needed */
@@ -1020,8 +1024,11 @@ static int vgacon_font_get(struct vc_data *c, struct console_font *font)
 static int vgacon_resize(struct vc_data *c, unsigned int width,
                                 unsigned int height)
 {
-        if (width % 2 || width > ORIG_VIDEO_COLS || height > ORIG_VIDEO_LINES)
-                return -EINVAL;
+        if (width % 2 || width > ORIG_VIDEO_COLS ||
+            height > (ORIG_VIDEO_LINES * vga_default_font_height)/
+            c->vc_font.height)
+                /* let svgatextmode tinker with video timings */
+                return 0;
 
         if (CON_IS_VISIBLE(c) && !vga_is_gfx) /* who knows */
                 vgacon_doresize(c, width, height);