vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

minimalising ATI impact

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-12-16 16:53:01 +01:00
parent 7ca3f5c2d9
commit db846aed9a
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
video/i386/pc/vbe.c
View file

@ -158,10 +158,8 @@ grub_vbe_set_video_mode (grub_uint32_t vbe_mode,
/* Try to set video mode. */ /* Try to set video mode. */
status = grub_vbe_bios_set_mode (vbe_mode, 0); status = grub_vbe_bios_set_mode (vbe_mode, 0);
#if 0
if (status != GRUB_VBE_STATUS_OK) if (status != GRUB_VBE_STATUS_OK)
return grub_error (GRUB_ERR_BAD_DEVICE, "cannot set VBE mode %x", vbe_mode); return grub_error (GRUB_ERR_BAD_DEVICE, "cannot set VBE mode %x", vbe_mode);
#endif
/* Save information for later usage. */ /* Save information for later usage. */
framebuffer.active_vbe_mode = vbe_mode; framebuffer.active_vbe_mode = vbe_mode;
@ -258,10 +256,10 @@ grub_vbe_get_video_mode (grub_uint32_t *mode)
/* Try to query current mode from VESA BIOS. */ /* Try to query current mode from VESA BIOS. */
status = grub_vbe_bios_get_mode (mode); status = grub_vbe_bios_get_mode (mode);
#if 0 /* XXX: ATI don't support get_mode. */
if (status != GRUB_VBE_STATUS_OK) if (status != GRUB_VBE_STATUS_OK)
return grub_error (GRUB_ERR_BAD_DEVICE, "cannot get current VBE mode"); *mode = 3;
#endif // return grub_error (GRUB_ERR_BAD_DEVICE, "cannot get current VBE mode");
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
@ -391,14 +389,15 @@ grub_video_vbe_setup (unsigned int width, unsigned int height,
break; break;
} }
#if 0
if ((vbe_mode_info.mode_attributes & 0x001) == 0) if ((vbe_mode_info.mode_attributes & 0x001) == 0)
/* If not available, skip it. */ /* If not available, skip it. */
continue; continue;
#if 0
if ((vbe_mode_info.mode_attributes & 0x002) == 0) if ((vbe_mode_info.mode_attributes & 0x002) == 0)
/* Not enough information. */ /* Not enough information. */
continue; continue;
#endif
if ((vbe_mode_info.mode_attributes & 0x008) == 0) if ((vbe_mode_info.mode_attributes & 0x008) == 0)
/* Monochrome is unusable. */ /* Monochrome is unusable. */
@ -416,7 +415,6 @@ grub_video_vbe_setup (unsigned int width, unsigned int height,
&& (vbe_mode_info.memory_model != GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR)) && (vbe_mode_info.memory_model != GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR))
/* Not compatible memory model. */ /* Not compatible memory model. */
continue; continue;
#endif
if ((vbe_mode_info.x_resolution != width) if ((vbe_mode_info.x_resolution != width)
|| (vbe_mode_info.y_resolution != height)) || (vbe_mode_info.y_resolution != height))