From a74e3a3be403e5f83ba5f601be3ef221035fbba2 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Tue, 31 Jan 2012 11:49:30 +0000 Subject: [PATCH] vesa: flush lfb after zeroing If Xen is going to relinquish the VGA console, flush the linear frame buffer after zeroing it in vesa_endboot(). Failing to do so in some circumstances leads to the actual linear framebuffer on the graphics card still containing the output of the Xen boot console can lead to ugly graphics output when dom0 is setting up the graphics card for its own use. While the patch is quite large, it is mostly just code motion to prevent having to forward declare lfb_flush(). The only functional change to vesa_endboot() is to insert a call to lbf_flush(). Signed-off-by: Andrew Cooper Committed-by: Keir Fraser xen-unstable changeset: 24615:ac9f32525376 xen-unstable date: Sat Jan 28 13:42:25 2012 +0000 --- xen/drivers/video/vesa.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/xen/drivers/video/vesa.c b/xen/drivers/video/vesa.c index aa31d9b891..566f4adadc 100644 --- a/xen/drivers/video/vesa.c +++ b/xen/drivers/video/vesa.c @@ -153,24 +153,6 @@ void __init vesa_init(void) xfree(line_len); } -void __init vesa_endboot(bool_t keep) -{ - if ( keep ) - { - xpos = 0; - vga_puts = vesa_scroll_puts; - } - else - { - unsigned int i, bpp = (vlfb_info.bits_per_pixel + 7) >> 3; - for ( i = 0; i < vlfb_info.height; i++ ) - memset(lfb + i * vlfb_info.bytes_per_line, 0, - vlfb_info.width * bpp); - } - - xfree(line_len); -} - #if defined(CONFIG_X86) #include @@ -217,6 +199,25 @@ static void lfb_flush(void) #endif +void __init vesa_endboot(bool_t keep) +{ + if ( keep ) + { + xpos = 0; + vga_puts = vesa_scroll_puts; + } + else + { + unsigned int i, bpp = (vlfb_info.bits_per_pixel + 7) >> 3; + for ( i = 0; i < vlfb_info.height; i++ ) + memset(lfb + i * vlfb_info.bytes_per_line, 0, + vlfb_info.width * bpp); + lfb_flush(); + } + + xfree(line_len); +} + /* Render one line of text to given linear framebuffer line. */ static void vesa_show_line( const unsigned char *text_line, -- 2.39.5