summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-02-29 17:05:09 -0500
committerAdam Jackson <ajax@redhat.com>2008-02-29 17:05:09 -0500
commit89d1940bc2aa05e20527bb11224fd3ce0156a593 (patch)
tree3ff0dfcdf6fd90068db6b894c80bfe840d3010c7
parent8e8efd5de2b3f5985b6df814392e6eecff2f97a3 (diff)
downloadxorg-driver-xf86-video-vesa-89d1940bc2aa05e20527bb11224fd3ce0156a593.tar.gz
Bug #10004: Fix palette initialization in 8bpp modes.
MemoryModel is an enum, not a bitfield; use == not & for the test.
-rw-r--r--src/vesa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vesa.c b/src/vesa.c
index e4e6547..57ca3a7 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -1169,7 +1169,7 @@ VESASetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode)
VBESetLogicalScanline(pVesa->pVbe, pScrn->displayWidth);
if (pScrn->bitsPerPixel == 8 && pVesa->vbeInfo->Capabilities[0] & 0x01 &&
- !(data->data->MemoryModel & 0x6 || data->data->MemoryModel & 0x7))
+ !(data->data->MemoryModel == 0x6 || data->data->MemoryModel == 0x7))
VBESetGetDACPaletteFormat(pVesa->pVbe, 8);
pScrn->vtSema = TRUE;