Yet another attempt to make palette loading more safer:

- Add a separate palette data for 8-bit DAC mode when SC_PIXEL_MODE is set
and fill it up with default gray-scale palette data for text.  Now we don't
have to set `hint.sc.0.vesa_mode' to get the default palette data.
- Add a new adapter flag, V_ADP_DAC8 to track whether the controller is
using 8-bit palette format and load correct palette when switching modes.
- Set 8-bit DAC mode only for non-VGA compatible graphics mode.

1 files changed, 9 insertions, 1 deletions

diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c
index f973169..d4f1725 100644
--- a/sys/dev/syscons/scvidctl.c
+++ b/sys/dev/syscons/scvidctl.c
@@ -725,6 +725,11 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td)
 #endif
 
 #ifndef SC_NO_PALETTE_LOADING
+#ifdef SC_PIXEL_MODE
+	    if ((adp->va_flags & V_ADP_DAC8) != 0)
+		vidd_load_palette(adp, scp->sc->palette2);
+	    else
+#endif
 	    vidd_load_palette(adp, scp->sc->palette);
 #endif
 
@@ -782,7 +787,10 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td)
 	    if (scp == scp->sc->cur_scp) {
 		set_mode(scp);
 #ifndef SC_NO_PALETTE_LOADING
-		vidd_load_palette(adp, scp->sc->palette);
+		if ((adp->va_flags & V_ADP_DAC8) != 0)
+		    vidd_load_palette(adp, scp->sc->palette2);
+		else
+		    vidd_load_palette(adp, scp->sc->palette);
 #endif
 	    }
 	    sc_clear_screen(scp);