From 6122955707a57a864667ead62cc05d4386f85e84 Mon Sep 17 00:00:00 2001 From: robertmh Date: Sat, 12 Sep 2009 13:07:27 +0000 Subject: [PATCH] 2009-09-12 Robert Millan * video/i386/pc/vbe.c (grub_vbe_get_video_mode_info): Move packed mode special handling (grub_vbe_bios_set_dac_palette_width() call) from here ... * loader/i386/linux.c [GRUB_MACHINE_PCBIOS] (grub_linux_setup_video): ... to here (with some adjustments). --- ChangeLog | 8 ++++++++ loader/i386/linux.c | 28 ++++++++++++++++++++++++++++ video/i386/pc/vbe.c | 18 ------------------ 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5eea781f7..0d967d550 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-09-12 Robert Millan + + * video/i386/pc/vbe.c (grub_vbe_get_video_mode_info): Move packed + mode special handling (grub_vbe_bios_set_dac_palette_width() call) + from here ... + * loader/i386/linux.c [GRUB_MACHINE_PCBIOS] + (grub_linux_setup_video): ... to here (with some adjustments). + 2009-09-12 Robert Millan Fix memory corruption issue (spotted by Colin Watson). diff --git a/loader/i386/linux.c b/loader/i386/linux.c index 4144384db..4bdb09b24 100644 --- a/loader/i386/linux.c +++ b/loader/i386/linux.c @@ -33,6 +33,7 @@ #include #include #include +#include #define GRUB_LINUX_CL_OFFSET 0x1000 #define GRUB_LINUX_CL_END_OFFSET 0x2000 @@ -416,6 +417,33 @@ grub_linux_setup_video (struct linux_kernel_params *params) params->reserved_mask_size = mode_info.reserved_mask_size; params->reserved_field_pos = mode_info.reserved_field_pos; + +#ifdef GRUB_MACHINE_PCBIOS + /* VESA packed modes may come with zeroed mask sizes, which need + to be set here according to DAC Palette width. If we don't, + this results in Linux displaying a black screen. */ + if (mode_info.bpp <= 8) + { + struct grub_vbe_info_block controller_info; + int status; + int width = 8; + + status = grub_vbe_bios_get_controller_info (&controller_info); + + if (status == GRUB_VBE_STATUS_OK && + (controller_info.capabilities & GRUB_VBE_CAPABILITY_DACWIDTH)) + status = grub_vbe_bios_set_dac_palette_width (&width); + + if (status != GRUB_VBE_STATUS_OK) + /* 6 is default after mode reset. */ + width = 6; + + params->red_mask_size = params->green_mask_size + = params->blue_mask_size = width; + params->reserved_mask_size = 0; + } +#endif + return 0; } diff --git a/video/i386/pc/vbe.c b/video/i386/pc/vbe.c index b41e22fa2..a285b26ba 100644 --- a/video/i386/pc/vbe.c +++ b/video/i386/pc/vbe.c @@ -286,24 +286,6 @@ grub_vbe_get_video_mode_info (grub_uint32_t mode, /* Make copy of mode info block. */ grub_memcpy (mode_info, mi_tmp, sizeof (*mode_info)); - - /* Packed mode. Query DAC Palette width for color sizes. */ - if (mode_info->bits_per_pixel <= 8) - { - int width = 8; - status = 0; - - if (controller_info.capabilities & GRUB_VBE_CAPABILITY_DACWIDTH) - status = grub_vbe_bios_set_dac_palette_width (& width); - - if (status != GRUB_VBE_STATUS_OK) - /* 6 is default after mode reset. */ - width = 6; - - mode_info->red_mask_size = mode_info->green_mask_size - = mode_info->blue_mask_size = width; - mode_info->rsvd_mask_size = 0; - } } else /* Just clear mode info block if it isn't a VESA mode. */