configure.ac | 2 src/IBMramdac.c | 1 src/TIramdac.c | 1 src/glint.h | 24 ++--- src/glint_dga.c | 1 src/glint_driver.c | 250 +++++++++++++++++++++++++++-------------------------- src/glint_regs.h | 5 + src/glint_shadow.c | 1 src/pm2_accel.c | 1 src/pm2_dac.c | 1 src/pm2_video.c | 1 src/pm2ramdac.c | 1 src/pm2v_dac.c | 3 src/pm2vramdac.c | 1 src/pm3_accel.c | 1 src/pm3_dac.c | 5 - src/pm3_video.c | 1 src/pm_accel.c | 1 src/pm_dac.c | 1 src/sx_accel.c | 1 src/tx_accel.c | 1 src/tx_dac.c | 3 22 files changed, 150 insertions(+), 157 deletions(-)
New commits: commit c4796200c2d322a59ccf2eeb2df3be874507fd48 Author: Matt Turner <[email protected]> Date: Wed Feb 15 23:12:23 2012 -0500 xf86-video-glint 1.2.7 Signed-off-by: Matt Turner <[email protected]> diff --git a/configure.ac b/configure.ac index 4765bc6..0f068b5 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-glint], - [1.2.6], + [1.2.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/glint], [xf86-video-glint]) AC_CONFIG_SRCDIR([Makefile.am]) commit 288243a9301c38baae63ec66ba344f0a8245b2ee Author: Matt Turner <[email protected]> Date: Wed Jan 25 13:07:23 2012 -0500 Remove uses of xf86PciInfo.h Signed-off-by: Matt Turner <[email protected]> diff --git a/src/IBMramdac.c b/src/IBMramdac.c index 774a3e6..0aca20e 100644 --- a/src/IBMramdac.c +++ b/src/IBMramdac.c @@ -32,7 +32,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "IBM.h" diff --git a/src/TIramdac.c b/src/TIramdac.c index 9fbaf44..42ece63 100644 --- a/src/TIramdac.c +++ b/src/TIramdac.c @@ -35,7 +35,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "TI.h" diff --git a/src/glint.h b/src/glint.h index f2a6fda..090fbe3 100644 --- a/src/glint.h +++ b/src/glint.h @@ -176,29 +176,29 @@ typedef struct { #define PCI_VENDOR_TI_CHIP_PERMEDIA \ ((PCI_VENDOR_TI << 16) | PCI_CHIP_TI_PERMEDIA) #define PCI_VENDOR_3DLABS_CHIP_PERMEDIA \ - ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_PERMEDIA) + ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_PERMEDIA) #define PCI_VENDOR_3DLABS_CHIP_PERMEDIA2 \ - ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_PERMEDIA2) + ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_PERMEDIA2) #define PCI_VENDOR_3DLABS_CHIP_PERMEDIA2V \ - ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_PERMEDIA2V) + ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_PERMEDIA2V) #define PCI_VENDOR_3DLABS_CHIP_PERMEDIA3 \ - ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_PERMEDIA3) + ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_PERMEDIA3) #define PCI_VENDOR_3DLABS_CHIP_PERMEDIA4 \ - ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_PERMEDIA4) + ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_PERMEDIA4) #define PCI_VENDOR_3DLABS_CHIP_R4 \ - ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_R4) + ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_R4) #define PCI_VENDOR_3DLABS_CHIP_300SX \ - ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_300SX) + ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_300SX) #define PCI_VENDOR_3DLABS_CHIP_500TX \ - ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_500TX) + ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_500TX) #define PCI_VENDOR_3DLABS_CHIP_MX \ - ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_MX) + ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_MX) #define PCI_VENDOR_3DLABS_CHIP_GAMMA \ - ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_GAMMA) + ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_GAMMA) #define PCI_VENDOR_3DLABS_CHIP_GAMMA2 \ - ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_GAMMA2) + ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_GAMMA2) #define PCI_VENDOR_3DLABS_CHIP_DELTA \ - ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_DELTA) + ((PCI_VENDOR_3DLABS << 16) | PCI_CHIP_3DLABS_DELTA) /* Prototypes */ diff --git a/src/glint_dga.c b/src/glint_dga.c index 734f507..44c162b 100644 --- a/src/glint_dga.c +++ b/src/glint_dga.c @@ -29,7 +29,6 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Pci.h" -#include "xf86PciInfo.h" #include "xaa.h" #include "xaalocal.h" #include "glint.h" diff --git a/src/glint_driver.c b/src/glint_driver.c index 95a4753..4a7bc76 100644 --- a/src/glint_driver.c +++ b/src/glint_driver.c @@ -37,7 +37,6 @@ #include "micmap.h" #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "xf86cmap.h" #include "shadowfb.h" @@ -359,13 +358,13 @@ GLINTDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode, (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_300SX) || (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_MX) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) && - (pGlint->MultiChip == PCI_CHIP_300SX)) || + (pGlint->MultiChip == PCI_CHIP_3DLABS_300SX)) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) && - (pGlint->MultiChip == PCI_CHIP_500TX)) || + (pGlint->MultiChip == PCI_CHIP_3DLABS_500TX)) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) && - (pGlint->MultiChip == PCI_CHIP_MX)) || + (pGlint->MultiChip == PCI_CHIP_3DLABS_MX)) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) && - (pGlint->MultiChip == PCI_CHIP_MX)) ) { + (pGlint->MultiChip == PCI_CHIP_3DLABS_MX)) ) { vtgpolarity = GLINT_READ_REG(VTGPolarity) & 0xFFFFFFF0; } else { videocontrol = GLINT_READ_REG(PMVideoControl) & 0xFFFFFFD6; @@ -400,13 +399,13 @@ GLINTDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode, (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_300SX) || (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_MX) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) && - (pGlint->MultiChip == PCI_CHIP_300SX)) || + (pGlint->MultiChip == PCI_CHIP_3DLABS_300SX)) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) && - (pGlint->MultiChip == PCI_CHIP_500TX)) || + (pGlint->MultiChip == PCI_CHIP_3DLABS_500TX)) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) && - (pGlint->MultiChip == PCI_CHIP_MX)) || + (pGlint->MultiChip == PCI_CHIP_3DLABS_MX)) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) && - (pGlint->MultiChip == PCI_CHIP_MX)) ) { + (pGlint->MultiChip == PCI_CHIP_3DLABS_MX)) ) { GLINT_SLOW_WRITE_REG(vtgpolarity, VTGPolarity); } else { GLINT_SLOW_WRITE_REG(videocontrol, PMVideoControl); @@ -614,9 +613,9 @@ GLINTProbe(DriverPtr drv, int flags) } } else /* Only claim other chips when GAMMA is used */ - if ((PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GAMMA) || - (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GAMMA2) || - (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_DELTA)) { + if ((PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_GAMMA) || + (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_GAMMA2) || + (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_DELTA)) { while (*checkusedPci != NULL) { int eIndex; /* make sure we claim all but our source device */ @@ -731,12 +730,12 @@ GetAccelPitchValues(ScrnInfoPtr pScrn) * only one chip is connected to GAMMA/DELTA as the entities > 1 */ switch (pGlint->MultiChip) { - case PCI_CHIP_MX: - case PCI_CHIP_500TX: - case PCI_CHIP_300SX: + case PCI_CHIP_3DLABS_MX: + case PCI_CHIP_3DLABS_500TX: + case PCI_CHIP_3DLABS_300SX: linep = &partprod500TX[0]; break; - case PCI_CHIP_PERMEDIA: + case PCI_CHIP_3DLABS_PERMEDIA: case PCI_CHIP_TI_PERMEDIA: linep = &partprodPermedia[0]; break; @@ -884,13 +883,13 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) for (i = 1; i < pScrn->numEntities; i++) { pEnt = xf86GetEntityInfo(pScrn->entityList[i]); pPci = xf86GetPciInfoForEntity(pEnt->index); - if ( (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_MX) || - (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_PERMEDIA) || + if ( (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_MX) || + (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_PERMEDIA) || (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_TI_PERMEDIA) || - (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_500TX) || - (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_300SX) || - (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_R4) || - (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_PERMEDIA3) ) { + (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_500TX) || + (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_300SX) || + (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_R4) || + (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_PERMEDIA3) ) { pGlint->MultiChip = PCI_DEV_DEVICE_ID(pPci); if (pGlint->numMultiDevices >= GLINT_MAX_MULTI_DEVICES) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, @@ -909,9 +908,9 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[0]); pciVideoPtr pPci = xf86GetPciInfoForEntity(pEnt->index); - if ( ((PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GAMMA) || - (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GAMMA2) || - (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_DELTA)) && + if ( ((PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_GAMMA) || + (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_GAMMA2) || + (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_3DLABS_DELTA)) && (pGlint->numMultiDevices == 0) ) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Gamma/Delta with ZERO connected chips, aborting\n"); @@ -923,9 +922,9 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[0]); pciVideoPtr pPci = xf86GetPciInfoForEntity(pEnt->index); - if ((PCI_DEV_DEVICE_ID(pPci) != PCI_CHIP_GAMMA) && - (PCI_DEV_DEVICE_ID(pPci) != PCI_CHIP_GAMMA2) && - (PCI_DEV_DEVICE_ID(pPci) != PCI_CHIP_DELTA)) { + if ((PCI_DEV_DEVICE_ID(pPci) != PCI_CHIP_3DLABS_GAMMA) && + (PCI_DEV_DEVICE_ID(pPci) != PCI_CHIP_3DLABS_GAMMA2) && + (PCI_DEV_DEVICE_ID(pPci) != PCI_CHIP_3DLABS_DELTA)) { GLINTProbeDDC(pScrn, pGlint->pEnt->index); return TRUE; } else @@ -1315,7 +1314,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) break; case PCI_VENDOR_3DLABS_CHIP_GAMMA: switch (pGlint->MultiChip) { - case PCI_CHIP_PERMEDIA3: + case PCI_CHIP_3DLABS_PERMEDIA3: Permedia3PreInit(pScrn); break; } @@ -1330,7 +1329,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) int base3copro, offset; if( (basedelta & 0x20000) ^ (basecopro & 0x20000) ) { - if ((pGlint->MultiChip == PCI_CHIP_PERMEDIA) || + if ((pGlint->MultiChip == PCI_CHIP_3DLABS_PERMEDIA) || (pGlint->MultiChip == PCI_CHIP_TI_PERMEDIA)) { offset = 0x20; /* base4 */ } else { @@ -1420,38 +1419,38 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) case PCI_VENDOR_3DLABS_CHIP_GAMMA: case PCI_VENDOR_3DLABS_CHIP_GAMMA2: switch (pGlint->MultiChip) { - case PCI_CHIP_PERMEDIA: + case PCI_CHIP_3DLABS_PERMEDIA: case PCI_CHIP_TI_PERMEDIA: xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Attached Rasterizer is GLINT Permedia\n"); pScrn->videoRam = (((GLINT_READ_REG(PMMemConfig)>>29) & 0x03) + 1) * 2048; break; - case PCI_CHIP_300SX: + case PCI_CHIP_3DLABS_300SX: xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Attached Rasterizer is GLINT 300SX\n"); pScrn->videoRam = (1 << ((GLINT_READ_REG(FBMemoryCtl) & 0xE0000000)>>29)) * 1024; break; - case PCI_CHIP_500TX: + case PCI_CHIP_3DLABS_500TX: xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Attached Rasterizer is GLINT 500TX\n"); pScrn->videoRam = (1 << ((GLINT_READ_REG(FBMemoryCtl) & 0xE0000000)>>29)) * 1024; break; - case PCI_CHIP_MX: + case PCI_CHIP_3DLABS_MX: xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Attached Rasterizer is GLINT MX\n"); pScrn->videoRam = (1 << ((GLINT_READ_REG(FBMemoryCtl) & 0xE0000000)>>29)) * 1024; break; - case PCI_CHIP_PERMEDIA3: + case PCI_CHIP_3DLABS_PERMEDIA3: xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Attached Rasterizer is Permedia3\n"); pScrn->videoRam = Permedia3MemorySizeDetect(pScrn); break; - case PCI_CHIP_R4: + case PCI_CHIP_3DLABS_R4: xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Attached Rasterizer is R4\n"); pScrn->videoRam = Permedia3MemorySizeDetect(pScrn); @@ -1642,7 +1641,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) case PCI_VENDOR_3DLABS_CHIP_DELTA: pGlint->FIFOSize = 15; switch (pGlint->MultiChip) { - case PCI_CHIP_PERMEDIA: + case PCI_CHIP_3DLABS_PERMEDIA: case PCI_CHIP_TI_PERMEDIA: maxheight = 1024; maxwidth = 1536; @@ -1665,9 +1664,9 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) if (!pGlint->RamDac) return FALSE; break; - case PCI_CHIP_500TX: - case PCI_CHIP_300SX: - case PCI_CHIP_MX: + case PCI_CHIP_3DLABS_500TX: + case PCI_CHIP_3DLABS_300SX: + case PCI_CHIP_3DLABS_MX: if (pScrn->bitsPerPixel == 24) { xf86DrvMsg(pScrn->scrnIndex, from, "-depth 24 -pixmap24 not supported by this chip.\n"); @@ -1762,8 +1761,8 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) } } if (!pGlint->RamDac) { - if ((pGlint->MultiChip == PCI_CHIP_PERMEDIA3) || - (pGlint->MultiChip == PCI_CHIP_R4)) { + if ((pGlint->MultiChip == PCI_CHIP_3DLABS_PERMEDIA3) || + (pGlint->MultiChip == PCI_CHIP_3DLABS_R4)) { pGlint->RefClock = 14318; pGlint->RamDacRec = RamDacCreateInfoRec(); pGlint->RamDacRec->ReadDAC = Permedia2vInIndReg; @@ -1832,18 +1831,18 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_300SX) || (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_MX) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) && - (pGlint->MultiChip == PCI_CHIP_300SX)) || + (pGlint->MultiChip == PCI_CHIP_3DLABS_300SX)) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) && - (pGlint->MultiChip == PCI_CHIP_500TX)) || + (pGlint->MultiChip == PCI_CHIP_3DLABS_500TX)) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) && - (pGlint->MultiChip == PCI_CHIP_MX)) || + (pGlint->MultiChip == PCI_CHIP_3DLABS_MX)) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) && - (pGlint->MultiChip == PCI_CHIP_MX)) ) + (pGlint->MultiChip == PCI_CHIP_3DLABS_MX)) ) pGlint->MaxClock = 220000; if ( (pGlint->Chipset == PCI_VENDOR_TI_CHIP_PERMEDIA) || (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) && - ((pGlint->MultiChip == PCI_CHIP_PERMEDIA) || + ((pGlint->MultiChip == PCI_CHIP_3DLABS_PERMEDIA) || (pGlint->MultiChip == PCI_CHIP_TI_PERMEDIA))) ) { switch (pScrn->bitsPerPixel) { case 8: @@ -1882,9 +1881,9 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA4) || (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_R4) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA2) && - (pGlint->MultiChip == PCI_CHIP_R4)) || + (pGlint->MultiChip == PCI_CHIP_3DLABS_R4)) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) && - (pGlint->MultiChip == PCI_CHIP_PERMEDIA3)) ) + (pGlint->MultiChip == PCI_CHIP_3DLABS_PERMEDIA3)) ) pGlint->MaxClock = 300000; } xf86DrvMsg(pScrn->scrnIndex, from, "Max pixel clock is %d MHz\n", @@ -1974,9 +1973,9 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA4) || (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_R4) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA2) && - (pGlint->MultiChip == PCI_CHIP_R4)) || + (pGlint->MultiChip == PCI_CHIP_3DLABS_R4)) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) && - (pGlint->MultiChip == PCI_CHIP_PERMEDIA3)) ) { + (pGlint->MultiChip == PCI_CHIP_3DLABS_PERMEDIA3)) ) { /* * XXX Assuming min pitch 256, max <maxwidth> * XXX Assuming min height 128, max <maxheight> @@ -2063,13 +2062,13 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_300SX) || (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_MX) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) && - (pGlint->MultiChip == PCI_CHIP_300SX)) || + (pGlint->MultiChip == PCI_CHIP_3DLABS_300SX)) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) && - (pGlint->MultiChip == PCI_CHIP_500TX)) || + (pGlint->MultiChip == PCI_CHIP_3DLABS_500TX)) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) && - (pGlint->MultiChip == PCI_CHIP_MX)) || + (pGlint->MultiChip == PCI_CHIP_3DLABS_MX)) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) && - (pGlint->MultiChip == PCI_CHIP_MX)) ) { + (pGlint->MultiChip == PCI_CHIP_3DLABS_MX)) ) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "This GLINT chip only supports one modeline, using first\n"); pScrn->modes->next = NULL; @@ -2119,13 +2118,13 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) case PCI_VENDOR_3DLABS_CHIP_GAMMA2: case PCI_VENDOR_3DLABS_CHIP_DELTA: switch (pGlint->MultiChip) { - case PCI_CHIP_MX: - case PCI_CHIP_500TX: - case PCI_CHIP_300SX: + case PCI_CHIP_3DLABS_MX: + case PCI_CHIP_3DLABS_500TX: + case PCI_CHIP_3DLABS_300SX: pGlint->pprod = partprod500TX[pScrn->displayWidth >> 5]; pGlint->bppalign = 0; break; - case PCI_CHIP_PERMEDIA: + case PCI_CHIP_3DLABS_PERMEDIA: case PCI_CHIP_TI_PERMEDIA: pGlint->pprod = partprodPermedia[pScrn->displayWidth >> 5]; pGlint->bppalign = bppand[(pScrn->bitsPerPixel>>3)-1]; @@ -2445,9 +2444,9 @@ GLINTSave(ScrnInfoPtr pScrn) case PCI_VENDOR_3DLABS_CHIP_GAMMA2: case PCI_VENDOR_3DLABS_CHIP_DELTA: switch (pGlint->MultiChip) { - case PCI_CHIP_500TX: - case PCI_CHIP_300SX: - case PCI_CHIP_MX: + case PCI_CHIP_3DLABS_500TX: + case PCI_CHIP_3DLABS_300SX: + case PCI_CHIP_3DLABS_MX: if (pGlint->numMultiDevices == 2) { ACCESSCHIP2() TXSave(pScrn, glintReg2); @@ -2459,13 +2458,13 @@ GLINTSave(ScrnInfoPtr pScrn) TXSave(pScrn, glintReg); (*pGlint->RamDac->Save)(pScrn, pGlint->RamDacRec, RAMDACreg); break; - case PCI_CHIP_PERMEDIA: + case PCI_CHIP_3DLABS_PERMEDIA: case PCI_CHIP_TI_PERMEDIA: PermediaSave(pScrn, glintReg); (*pGlint->RamDac->Save)(pScrn, pGlint->RamDacRec, RAMDACreg); break; - case PCI_CHIP_R4: - case PCI_CHIP_PERMEDIA3: + case PCI_CHIP_3DLABS_R4: + case PCI_CHIP_3DLABS_PERMEDIA3: if (pGlint->numMultiDevices == 2) { ACCESSCHIP2(); Permedia3Save(pScrn, glintReg2); @@ -2524,9 +2523,9 @@ GLINTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) case PCI_VENDOR_3DLABS_CHIP_GAMMA2: case PCI_VENDOR_3DLABS_CHIP_DELTA: switch (pGlint->MultiChip) { - case PCI_CHIP_MX: - case PCI_CHIP_500TX: - case PCI_CHIP_300SX: + case PCI_CHIP_3DLABS_MX: + case PCI_CHIP_3DLABS_500TX: + case PCI_CHIP_3DLABS_300SX: if (pGlint->numMultiDevices == 2) { ACCESSCHIP2(); ret = TXInit(pScrn, mode, glintReg2); @@ -2534,12 +2533,12 @@ GLINTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) } ret = TXInit(pScrn, mode, glintReg); break; - case PCI_CHIP_PERMEDIA: + case PCI_CHIP_3DLABS_PERMEDIA: case PCI_CHIP_TI_PERMEDIA: ret = PermediaInit(pScrn, mode); break; - case PCI_CHIP_R4: - case PCI_CHIP_PERMEDIA3: + case PCI_CHIP_3DLABS_R4: + case PCI_CHIP_3DLABS_PERMEDIA3: if (pGlint->numMultiDevices == 2) { ACCESSCHIP2(); ret = Permedia3Init(pScrn, mode, glintReg2); @@ -2588,9 +2587,9 @@ GLINTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) case PCI_VENDOR_3DLABS_CHIP_GAMMA2: case PCI_VENDOR_3DLABS_CHIP_DELTA: switch (pGlint->MultiChip) { - case PCI_CHIP_500TX: - case PCI_CHIP_300SX: - case PCI_CHIP_MX: + case PCI_CHIP_3DLABS_500TX: + case PCI_CHIP_3DLABS_300SX: + case PCI_CHIP_3DLABS_MX: if (pGlint->numMultiDevices == 2) { ACCESSCHIP2(); TXRestore(pScrn, glintReg2); @@ -2602,13 +2601,13 @@ GLINTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) TXRestore(pScrn, glintReg); (*pGlint->RamDac->Restore)(pScrn, pGlint->RamDacRec, RAMDACreg); break; - case PCI_CHIP_PERMEDIA: + case PCI_CHIP_3DLABS_PERMEDIA: case PCI_CHIP_TI_PERMEDIA: PermediaRestore(pScrn, glintReg); (*pGlint->RamDac->Restore)(pScrn, pGlint->RamDacRec, RAMDACreg); break; - case PCI_CHIP_R4: - case PCI_CHIP_PERMEDIA3: + case PCI_CHIP_3DLABS_R4: + case PCI_CHIP_3DLABS_PERMEDIA3: if (pGlint->numMultiDevices == 2) { ACCESSCHIP2(); Permedia3Restore(pScrn, glintReg2); @@ -2678,9 +2677,9 @@ GLINTRestore(ScrnInfoPtr pScrn) case PCI_VENDOR_3DLABS_CHIP_GAMMA2: case PCI_VENDOR_3DLABS_CHIP_DELTA: switch (pGlint->MultiChip) { - case PCI_CHIP_MX: - case PCI_CHIP_500TX: - case PCI_CHIP_300SX: + case PCI_CHIP_3DLABS_MX: + case PCI_CHIP_3DLABS_500TX: + case PCI_CHIP_3DLABS_300SX: if (pGlint->numMultiDevices == 2) { ACCESSCHIP2(); TXRestore(pScrn, glintReg2); @@ -2692,13 +2691,13 @@ GLINTRestore(ScrnInfoPtr pScrn) TXRestore(pScrn, glintReg); (*pGlint->RamDac->Restore)(pScrn, pGlint->RamDacRec, RAMDACreg); break; - case PCI_CHIP_PERMEDIA: + case PCI_CHIP_3DLABS_PERMEDIA: case PCI_CHIP_TI_PERMEDIA: PermediaRestore(pScrn, glintReg); (*pGlint->RamDac->Restore)(pScrn, pGlint->RamDacRec, RAMDACreg); break; - case PCI_CHIP_R4: - case PCI_CHIP_PERMEDIA3: + case PCI_CHIP_3DLABS_R4: + case PCI_CHIP_3DLABS_PERMEDIA3: if (pGlint->numMultiDevices == 2) { ACCESSCHIP2(); Permedia3Restore(pScrn, glintReg2); @@ -2883,19 +2882,19 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) case PCI_VENDOR_3DLABS_CHIP_GAMMA2: case PCI_VENDOR_3DLABS_CHIP_DELTA: switch (pGlint->MultiChip) { - case PCI_CHIP_500TX: - case PCI_CHIP_MX: + case PCI_CHIP_3DLABS_500TX: + case PCI_CHIP_3DLABS_MX: TXAccelInit(pScreen); break; - case PCI_CHIP_300SX: + case PCI_CHIP_3DLABS_300SX: SXAccelInit(pScreen); break; - case PCI_CHIP_PERMEDIA: + case PCI_CHIP_3DLABS_PERMEDIA: case PCI_CHIP_TI_PERMEDIA: PermediaAccelInit(pScreen); break; - case PCI_CHIP_R4: - case PCI_CHIP_PERMEDIA3: + case PCI_CHIP_3DLABS_R4: + case PCI_CHIP_3DLABS_PERMEDIA3: Permedia3AccelInit(pScreen); break; } @@ -2924,9 +2923,9 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA4) || (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_R4) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA2) && - (pGlint->MultiChip == PCI_CHIP_R4)) || + (pGlint->MultiChip == PCI_CHIP_3DLABS_R4)) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) && - (pGlint->MultiChip == PCI_CHIP_PERMEDIA3)) ) + (pGlint->MultiChip == PCI_CHIP_3DLABS_PERMEDIA3)) ) Permedia2vHWCursorInit(pScreen); else /* If we get here pGlint->Ramdac should have been set */ @@ -2948,9 +2947,9 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA4) || (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_R4) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA2) && - (pGlint->MultiChip == PCI_CHIP_R4)) || + (pGlint->MultiChip == PCI_CHIP_3DLABS_R4)) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) && - (pGlint->MultiChip == PCI_CHIP_PERMEDIA3)) ) { + (pGlint->MultiChip == PCI_CHIP_3DLABS_PERMEDIA3)) ) { if (!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, (pGlint->FBDev) ? fbdevHWLoadPaletteWeak() : ((pScrn->depth == 16) ? Permedia3LoadPalette16:Permedia3LoadPalette), @@ -3016,8 +3015,8 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) case PCI_VENDOR_3DLABS_CHIP_GAMMA: case PCI_VENDOR_3DLABS_CHIP_GAMMA2: switch (pGlint->MultiChip) { - case PCI_CHIP_R4: - case PCI_CHIP_PERMEDIA3: + case PCI_CHIP_3DLABS_R4: + case PCI_CHIP_3DLABS_PERMEDIA3: Permedia3InitVideo(pScreen); } } @@ -3073,19 +3072,19 @@ GLINTSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) case PCI_VENDOR_3DLABS_CHIP_GAMMA2: case PCI_VENDOR_3DLABS_CHIP_DELTA: switch (pGlint->MultiChip) { - case PCI_CHIP_500TX: - case PCI_CHIP_MX: + case PCI_CHIP_3DLABS_500TX: + case PCI_CHIP_3DLABS_MX: TXInitializeEngine(pScrn); break; - case PCI_CHIP_300SX: + case PCI_CHIP_3DLABS_300SX: SXInitializeEngine(pScrn); break; - case PCI_CHIP_PERMEDIA: + case PCI_CHIP_3DLABS_PERMEDIA: case PCI_CHIP_TI_PERMEDIA: PermediaInitializeEngine(pScrn); break; - case PCI_CHIP_R4: - case PCI_CHIP_PERMEDIA3: + case PCI_CHIP_3DLABS_R4: + case PCI_CHIP_3DLABS_PERMEDIA3: Permedia3InitializeEngine(pScrn); break; } @@ -3146,12 +3145,12 @@ GLINTAdjustFrame(int scrnIndex, int x, int y, int flags) case PCI_VENDOR_3DLABS_CHIP_GAMMA2: case PCI_VENDOR_3DLABS_CHIP_DELTA: switch (pGlint->MultiChip) { - case PCI_CHIP_R4: - case PCI_CHIP_PERMEDIA3: + case PCI_CHIP_3DLABS_R4: + case PCI_CHIP_3DLABS_PERMEDIA3: base = (y * pScrn->displayWidth + x) >> pGlint->BppShift; GLINT_SLOW_WRITE_REG(base, PMScreenBase); break; - case PCI_CHIP_PERMEDIA: + case PCI_CHIP_3DLABS_PERMEDIA: case PCI_CHIP_TI_PERMEDIA: GLINT_SLOW_WRITE_REG(base, PMScreenBase); break; @@ -3220,19 +3219,19 @@ GLINTEnterVT(int scrnIndex, int flags) case PCI_VENDOR_3DLABS_CHIP_GAMMA2: case PCI_VENDOR_3DLABS_CHIP_DELTA: switch (pGlint->MultiChip) { - case PCI_CHIP_500TX: - case PCI_CHIP_MX: + case PCI_CHIP_3DLABS_500TX: + case PCI_CHIP_3DLABS_MX: TXInitializeEngine(pScrn); break; - case PCI_CHIP_300SX: + case PCI_CHIP_3DLABS_300SX: SXInitializeEngine(pScrn); break; - case PCI_CHIP_PERMEDIA: + case PCI_CHIP_3DLABS_PERMEDIA: case PCI_CHIP_TI_PERMEDIA: PermediaInitializeEngine(pScrn); break; - case PCI_CHIP_R4: - case PCI_CHIP_PERMEDIA3: + case PCI_CHIP_3DLABS_R4: + case PCI_CHIP_3DLABS_PERMEDIA3: Permedia3InitializeEngine(pScrn); break; } @@ -3444,9 +3443,9 @@ GLINTSaveScreen(ScreenPtr pScreen, int mode) case PCI_VENDOR_3DLABS_CHIP_GAMMA2: case PCI_VENDOR_3DLABS_CHIP_DELTA: switch (pGlint->MultiChip) { - case PCI_CHIP_R4: - case PCI_CHIP_PERMEDIA3: - case PCI_CHIP_PERMEDIA: + case PCI_CHIP_3DLABS_R4: + case PCI_CHIP_3DLABS_PERMEDIA3: + case PCI_CHIP_3DLABS_PERMEDIA: case PCI_CHIP_TI_PERMEDIA: temp = GLINT_READ_REG(PMVideoControl); if (unblank) temp |= 1; @@ -3660,21 +3659,21 @@ Shiftbpp(ScrnInfoPtr pScrn, int value) case PCI_VENDOR_3DLABS_CHIP_GAMMA2: case PCI_VENDOR_3DLABS_CHIP_DELTA: switch (pGlint->MultiChip) { - case PCI_CHIP_500TX: - case PCI_CHIP_300SX: - case PCI_CHIP_MX: + case PCI_CHIP_3DLABS_500TX: + case PCI_CHIP_3DLABS_300SX: + case PCI_CHIP_3DLABS_MX: if ( (pGlint->RamDac->RamDacType == (IBM640_RAMDAC)) || (pGlint->RamDac->RamDacType == (TI3030_RAMDAC)) ) logbytesperaccess = 4; else logbytesperaccess = 3; break; - case PCI_CHIP_PERMEDIA: + case PCI_CHIP_3DLABS_PERMEDIA: case PCI_CHIP_TI_PERMEDIA: logbytesperaccess = 2; break; - case PCI_CHIP_R4: - case PCI_CHIP_PERMEDIA3: + case PCI_CHIP_3DLABS_R4: + case PCI_CHIP_3DLABS_PERMEDIA3: logbytesperaccess = 4; break; } diff --git a/src/glint_regs.h b/src/glint_regs.h index 4fce62e..dda2f2b 100644 --- a/src/glint_regs.h +++ b/src/glint_regs.h @@ -30,6 +30,11 @@ #define PCI_CHIP_3DLABS_PERMEDIA4 0x0C #define PCI_CHIP_3DLABS_R4 0x0D #define PCI_CHIP_3DLABS_GAMMA2 0x0E +#define PCI_CHIP_3DLABS_R4ALT 0x11 + +/* Texas Instruments */ +#define PCI_CHIP_TI_PERMEDIA 0x3D04 +#define PCI_CHIP_TI_PERMEDIA2 0x3D07 /* The boards we know */ #define IS_GLORIAXXL ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x1048) && \ diff --git a/src/glint_shadow.c b/src/glint_shadow.c index 1ad9cdd..33f4e3f 100644 --- a/src/glint_shadow.c +++ b/src/glint_shadow.c @@ -10,7 +10,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "glint.h" #include "shadowfb.h" diff --git a/src/pm2_accel.c b/src/pm2_accel.c index a8e136d..794a1c2 100644 --- a/src/pm2_accel.c +++ b/src/pm2_accel.c @@ -39,7 +39,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "miline.h" diff --git a/src/pm2_dac.c b/src/pm2_dac.c index 941ede6..c2ae8eb 100644 --- a/src/pm2_dac.c +++ b/src/pm2_dac.c @@ -37,7 +37,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "glint_regs.h" diff --git a/src/pm2_video.c b/src/pm2_video.c index 957d985..f5bbdf3 100644 --- a/src/pm2_video.c +++ b/src/pm2_video.c @@ -28,7 +28,6 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Pci.h" -#include "xf86PciInfo.h" #include "xf86fbman.h" #include "xf86i2c.h" #include "xf86xv.h" diff --git a/src/pm2ramdac.c b/src/pm2ramdac.c index 7a3e8a0..1de2138 100644 --- a/src/pm2ramdac.c +++ b/src/pm2ramdac.c @@ -32,7 +32,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "glint_regs.h" diff --git a/src/pm2v_dac.c b/src/pm2v_dac.c index 888cab7..816f8c6 100644 --- a/src/pm2v_dac.c +++ b/src/pm2v_dac.c @@ -35,7 +35,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "glint_regs.h" @@ -496,7 +495,7 @@ Permedia2vCursorColorCallback( if ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_PERMEDIA3) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA) && - (pGlint->MultiChip == PCI_CHIP_PERMEDIA3)) ) { + (pGlint->MultiChip == PCI_CHIP_3DLABS_PERMEDIA3)) ) { /* PM3 uses last 2 indexes into hardware cursor palette fg first...*/ Permedia2vOutIndReg(pScrn, PM2VDACRDCursorPalette+39, 0x00, (fg>>16)&0xff); Permedia2vOutIndReg(pScrn, PM2VDACRDCursorPalette+40, 0x00, (fg>>8)&0xff); diff --git a/src/pm2vramdac.c b/src/pm2vramdac.c index 1f7eb08..211d886 100644 --- a/src/pm2vramdac.c +++ b/src/pm2vramdac.c @@ -32,7 +32,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "glint_regs.h" diff --git a/src/pm3_accel.c b/src/pm3_accel.c index 0055a7b..56dbe2c 100644 --- a/src/pm3_accel.c +++ b/src/pm3_accel.c @@ -35,7 +35,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "miline.h" diff --git a/src/pm3_dac.c b/src/pm3_dac.c index 8e8609a..92199a3 100644 --- a/src/pm3_dac.c +++ b/src/pm3_dac.c @@ -34,7 +34,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "xf86int10.h" @@ -565,11 +564,11 @@ Permedia3Init(ScrnInfoPtr pScrn, DisplayModePtr mode, GLINTRegPtr pReg) break; case PCI_VENDOR_3DLABS_CHIP_GAMMA: switch (pGlint->MultiChip) { - case PCI_CHIP_PERMEDIA3: + case PCI_CHIP_3DLABS_PERMEDIA3: (void) PM3DAC_CalculateClock(mode->Clock, pGlint->RefClock, &m,&n,&p); break; - case PCI_CHIP_R4: + case PCI_CHIP_3DLABS_R4: (void) PM4DAC_CalculateClock(mode->Clock, pGlint->RefClock, &m,&n,&p); break; diff --git a/src/pm3_video.c b/src/pm3_video.c index db68f09..524d6dc 100644 --- a/src/pm3_video.c +++ b/src/pm3_video.c @@ -30,7 +30,6 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "compiler.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "xf86fbman.h" #include "regionstr.h" diff --git a/src/pm_accel.c b/src/pm_accel.c index 28ccd88..aea4c12 100644 --- a/src/pm_accel.c +++ b/src/pm_accel.c @@ -36,7 +36,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "fb.h" diff --git a/src/pm_dac.c b/src/pm_dac.c index 4437f33..d7761bf 100644 --- a/src/pm_dac.c +++ b/src/pm_dac.c @@ -35,7 +35,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "IBM.h" diff --git a/src/sx_accel.c b/src/sx_accel.c index adfb055..38c5c46 100644 --- a/src/sx_accel.c +++ b/src/sx_accel.c @@ -36,7 +36,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "fb.h" diff --git a/src/tx_accel.c b/src/tx_accel.c index 5a02672..51baef4 100644 --- a/src/tx_accel.c +++ b/src/tx_accel.c @@ -36,7 +36,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "fb.h" diff --git a/src/tx_dac.c b/src/tx_dac.c index abbe06a..e2245ab 100644 --- a/src/tx_dac.c +++ b/src/tx_dac.c @@ -35,7 +35,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "IBM.h" @@ -164,7 +163,7 @@ TXInit(ScrnInfoPtr pScrn, DisplayModePtr mode, GLINTRegPtr pReg) /* Override FBModeSel for 300SX chip */ if ( (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_300SX) || ((pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_DELTA) && - (pGlint->MultiChip == PCI_CHIP_300SX)) ) { + (pGlint->MultiChip == PCI_CHIP_3DLABS_300SX)) ) { switch (pScrn->bitsPerPixel) { case 8: STOREREG(FBModeSel, 0x905); commit 754a81fc5f91be4d35853953c1a803a421b0379d Author: Adam Jackson <[email protected]> Date: Mon Dec 19 16:27:31 2011 -0500 Fall back to shadowfb if XAA is unavailable Signed-off-by: Adam Jackson <[email protected]> diff --git a/src/glint_driver.c b/src/glint_driver.c index abb8e47..95a4753 100644 --- a/src/glint_driver.c +++ b/src/glint_driver.c @@ -2254,8 +2254,9 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) /* Load XAA if needed */ if (!pGlint->NoAccel) { if (!xf86LoadSubModule(pScrn, "xaa")) { - GLINTFreeRec(pScrn); - return FALSE; + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadowfb\n"); + pGlint->NoAccel = 1; + pGlint->ShadowFB = 1; } } commit c539e59ba332fba669e025f8d0d680d2a2b1c9ff Author: Jeremy Huddleston <[email protected]> Date: Sat Oct 29 17:12:58 2011 -0700 Disable PC98 code on newer servers. Signed-off-by: Jeremy Huddleston <[email protected]> diff --git a/src/glint_driver.c b/src/glint_driver.c index ebe5c25..abb8e47 100644 --- a/src/glint_driver.c +++ b/src/glint_driver.c @@ -2619,8 +2619,10 @@ GLINTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) break; } -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
