Don't call VBEGetSetDACPaletteFormat when running in direct colour or YUVxf86-video-vesa-1_2_1

    modes. (David Sterratt) Bump to 1.2.1.

3 files changed, 12 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index b021a7c..fa37d43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-06-03  Daniel Stone  <daniel@freedesktop.org>
+
+	* configure.ac:
+	Bump to 1.2.1.
+
+	* src/vesa.c:
+	Don't call VBEGetSetDACPaletteFormat when running in direct colour or
+	YUV modes.  (David Sterratt)
+
 2006-05-19  Adam Jackson  <ajax@freedesktop.org>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index b40a469..39b4dc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-vesa],
-        1.2.0,
+        1.2.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-vesa)
 
diff --git a/src/vesa.c b/src/vesa.c
index 3dc3905..bd4bf42 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -1073,7 +1073,8 @@ VESASetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode)
     if (data->data->XResolution != pScrn->displayWidth)
 	VBESetLogicalScanline(pVesa->pVbe, pScrn->displayWidth);
 
-    if (pScrn->bitsPerPixel == 8 && pVesa->vbeInfo->Capabilities[0] & 0x01)
+    if (pScrn->bitsPerPixel == 8 && pVesa->vbeInfo->Capabilities[0] & 0x01 &&
+        !(data->data->MemoryModel & 0x6 || data->data->MemoryModel & 0x7)) 
 	VBESetGetDACPaletteFormat(pVesa->pVbe, 8);
 
     pScrn->vtSema = TRUE;