kern/144654: [vesa] VESA support broken on FreeBSD 8.0 Stable [regression]

[Jung-uk Kim]

On Monday 15 March 2010 02:41 pm, Jung-uk Kim wrote:
> Can you please try the attached patch?

Oops, it attached a wrong patch.  Please try this instead.

Sorry for the inconvenience,

Jung-uk Kim
-------------- next part --------------
--- sys/dev/fb/vesa.c.orig	2010-02-23 16:51:14.000000000 -0500
+++ sys/dev/fb/vesa.c	2010-03-15 16:45:45.000000000 -0400
@@ -1322,8 +1322,7 @@ vesa_save_palette(video_adapter_t *adp, 
 {
 	int bits;
 
-	if (adp == vesa_adp && VESA_MODE(adp->va_mode) &&
-	    (adp->va_info.vi_flags & V_INFO_NONVGA) != 0) {
+	if (adp == vesa_adp && VESA_MODE(adp->va_mode)) {
 		bits = (adp->va_flags & V_ADP_DAC8) != 0 ? 8 : 6;
 		return (vesa_bios_save_palette(0, 256, palette, bits));
 	}
@@ -1336,8 +1335,7 @@ vesa_load_palette(video_adapter_t *adp, 
 {
 	int bits;
 
-	if (adp == vesa_adp && VESA_MODE(adp->va_mode) &&
-	    (adp->va_info.vi_flags & V_INFO_NONVGA) != 0) {
+	if (adp == vesa_adp && VESA_MODE(adp->va_mode)) {
 		bits = (adp->va_flags & V_ADP_DAC8) != 0 ? 8 : 6;
 		return (vesa_bios_load_palette(0, 256, palette, bits));
 	}
@@ -1544,8 +1542,6 @@ get_palette(video_adapter_t *adp, int ba
 		return (1);
 	if (!VESA_MODE(adp->va_mode))
 		return (1);
-	if ((adp->va_info.vi_flags & V_INFO_NONVGA) == 0)
-		return (1);
 
 	bits = (adp->va_flags & V_ADP_DAC8) != 0 ? 8 : 6;
 	r = malloc(count * 3, M_DEVBUF, M_WAITOK);
@@ -1582,8 +1578,6 @@ set_palette(video_adapter_t *adp, int ba
 		return (1);
 	if (!VESA_MODE(adp->va_mode))
 		return (1);
-	if ((adp->va_info.vi_flags & V_INFO_NONVGA) == 0)
-		return (1);
 
 	bits = (adp->va_flags & V_ADP_DAC8) != 0 ? 8 : 6;
 	r = malloc(count * 3, M_DEVBUF, M_WAITOK);