diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2007-04-20 00:13:31 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2007-04-20 00:13:31 -0700 |
| commit | ae582bdd2107d7e0106d1d5a9a9d6b9e39f1c901 (patch) | |
| tree | 0055ebf5bbfaab2f39829fab2a08465908e95649 /src | |
| parent | f7c62016f8bf9ced7d56f74ce26e13b6df040379 (diff) | |
Always support G80.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/nv_driver.c | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index d024283..b31ebea 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -66,7 +66,6 @@ riva_sources = \ riva_type.h \ riva_xaa.c -if SUPPORT_G80 g80_sources = \ g80_cursor.c \ g80_cursor.h \ @@ -82,4 +81,3 @@ g80_sources = \ g80_type.h \ g80_xaa.c \ g80_xaa.h -endif diff --git a/src/nv_driver.c b/src/nv_driver.c index 64d45c5..f9fdc7e 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -333,12 +333,11 @@ static SymTabRec NVKnownChipsets[] = { 0x10DE0244, "GeForce Go 6150" }, { 0x10DE0247, "GeForce Go 6100" }, -#if SUPPORT_G80 +/*************** G8x ***************/ { 0x10DE0191, "GeForce 8800 GTX" }, { 0x10DE0193, "GeForce 8800 GTS" }, { 0x10DE019D, "Quadro FX 5600" }, { 0x10DE019E, "Quadro FX 4600" }, -#endif {-1, NULL} }; @@ -655,7 +654,6 @@ NVGetPCIXpressChip (pciVideoPtr pVideo) return pciid; } -#if SUPPORT_G80 static Bool NVIsG80(int chipType) { @@ -668,7 +666,6 @@ NVIsG80(int chipType) return FALSE; } -#endif /* Mandatory */ static Bool @@ -754,10 +751,8 @@ NVProbe(DriverPtr drv, int flags) default: break; /* we don't recognize it */ } -#if SUPPORT_G80 if(NVIsG80((*ppPci)->chipType)) canHandle = TRUE; -#endif if(canHandle) { NVChipsets[numUsed].token = pciid; @@ -795,11 +790,9 @@ NVProbe(DriverPtr drv, int flags) if(pPci->vendor == PCI_VENDOR_NVIDIA_SGS) { if(RivaGetScrnInfoRec(NVPciChipsets, usedChips[i])) foundScreen = TRUE; -#if SUPPORT_G80 } else if (NVIsG80(pPci->chipType)) { if(G80GetScrnInfoRec(NVPciChipsets, usedChips[i])) foundScreen = TRUE; -#endif } else { if(NVGetScrnInfoRec(NVPciChipsets, usedChips[i])) foundScreen = TRUE; |