diff options
| author | Ian Romanick <idr@us.ibm.com> | 2008-05-30 17:51:22 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2008-05-30 17:51:22 -0700 |
| commit | 9ee7b04b1fe57834a541ef27b4e25acffd3ac1c5 (patch) | |
| tree | 2b1de9248e03f2d23a259eae0f49713f22182539 /src/mga_dac3026.c | |
| parent | 254299d06eba2ede820f1fe2929a4b247ead39b1 (diff) | |
cfb8_32: Gut a remnants of support for 24-bit with 8-bit overlay
Diffstat (limited to 'src/mga_dac3026.c')
| -rw-r--r-- | src/mga_dac3026.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/mga_dac3026.c b/src/mga_dac3026.c index e33f914..27cc6c8 100644 --- a/src/mga_dac3026.c +++ b/src/mga_dac3026.c @@ -136,14 +136,6 @@ const static unsigned char MGADACbpp32[DACREGSIZE] = { 0x00 }; -/* on at least some 2064Ws, the PSEL line flips at 4MB or so, so PSEL keying - has to be off in register 0x1e -> bit4 clear */ - -const static unsigned char MGADACbpp8plus24[DACREGSIZE] = { - 0x07, 0x06, 0x5b, 0x05, 0x00, 0x00, 0x2C, 0x00, 0x1E, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x01, 0x00, 0x00, - 0x00 -}; /* * Read/write to the DAC via MMIO @@ -517,11 +509,8 @@ MGA3026Init(ScrnInfoPtr pScrn, DisplayModePtr mode) initDAC = MGADACbpp24; break; case 32: - if(pLayout->Overlay8Plus24) - initDAC = MGADACbpp8plus24; - else - initDAC = MGADACbpp32; - break; + initDAC = MGADACbpp32; + break; default: FatalError("MGA: unsupported bits per pixel\n"); } @@ -536,11 +525,6 @@ MGA3026Init(ScrnInfoPtr pScrn, DisplayModePtr mode) index_1d = i; } - if((pLayout->bitsPerPixel == 32) && pLayout->Overlay8Plus24) { - pReg->DacRegs[9] = pMga->colorKey; - pReg->DacRegs[10] = pMga->colorKey; - } - if ( (pLayout->bitsPerPixel == 16) && (pLayout->weight.red == 5) && (pLayout->weight.green == 5) && (pLayout->weight.blue == 5) ) { pReg->DacRegs[1] &= ~0x01; @@ -1138,9 +1122,6 @@ void MGA3026LoadPalette( MGAPtr pMga = MGAPTR(pScrn); int i, index; - if(pMga->CurrentLayout.Overlay8Plus24 && (pVisual->nplanes != 8)) - return; - if (pVisual->nplanes == 16) { for(i = 0; i < numColors; i++) { index = indices[i]; |