diff options
author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2012-07-30 06:54:16 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2012-12-13 12:15:29 -0500 |
commit | fa4dbbc602a1fb020b627ca8d5a265ad7f3d0c48 (patch) | |
tree | 2d6f5fe5f1e135a7214e5124339aefb3b7cb7058 /drivers/video/console | |
parent | 5613d482394e35e363daf51f55971d6cf88d3d7e (diff) |
VIDEO: Newport Fix console crashes
Because of commit e84de0c61905030a0fe66b7210b6f1bb7c3e1eab [MIPS: GIO bus
support for SGI IP22/28] newport con is now taking over console from
dummy con, therefore it's necessary to resize the VC to the correct size
to avoid crashes and garbage on console
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: linux-mips@linux-mips.org
Cc: linux-fbdev@vger.kernel.org
Cc: FlorianSchandinat@gmx.de
Patchwork: https://patchwork.linux-mips.org/patch/4138/
Acked-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'drivers/video/console')
-rw-r--r-- | drivers/video/console/newport_con.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c index 6d1596629040..b05afd03729e 100644 --- a/drivers/video/console/newport_con.c +++ b/drivers/video/console/newport_con.c | |||
@@ -327,9 +327,16 @@ out_unmap: | |||
327 | 327 | ||
328 | static void newport_init(struct vc_data *vc, int init) | 328 | static void newport_init(struct vc_data *vc, int init) |
329 | { | 329 | { |
330 | vc->vc_cols = newport_xsize / 8; | 330 | int cols, rows; |
331 | vc->vc_rows = newport_ysize / 16; | 331 | |
332 | cols = newport_xsize / 8; | ||
333 | rows = newport_ysize / 16; | ||
332 | vc->vc_can_do_color = 1; | 334 | vc->vc_can_do_color = 1; |
335 | if (init) { | ||
336 | vc->vc_cols = cols; | ||
337 | vc->vc_rows = rows; | ||
338 | } else | ||
339 | vc_resize(vc, cols, rows); | ||
333 | } | 340 | } |
334 | 341 | ||
335 | static void newport_deinit(struct vc_data *c) | 342 | static void newport_deinit(struct vc_data *c) |