summaryrefslogtreecommitdiff
path: root/src/nv_setup.c
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2004-12-10 03:56:42 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2004-12-10 03:56:42 +0000
commit67c89797f62ea53b37927c64e0403e7e7c42de56 (patch)
tree21a3996f2f9a7e928860eb771335c0ad8b57ecf5 /src/nv_setup.c
parent7c34d051168eba499beb20c40fd95703375f4c7b (diff)
Bugzilla #1985 <https://bugs.freedesktop.org/show_bug.cgi?id=1985> sync toxprint_packagertest_20041217_basexprint_packagertest_20041217
12/08/04 version of Nvidia driver from Mark Vojkovich, including these fixes since last sync: Fix some DAC/Graphics memory contention issues on newer NVIDIA chips (specifically, NV40). More PCI IDs. Also, I've had trouble getting some panels to work automagically so I expose an FPTweak option to let the user adjust a troublesome register.
Diffstat (limited to 'src/nv_setup.c')
-rw-r--r--src/nv_setup.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/nv_setup.c b/src/nv_setup.c
index cc157f6..95bb42f 100644
--- a/src/nv_setup.c
+++ b/src/nv_setup.c
@@ -37,7 +37,7 @@
|* *|
\***************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v 1.43 2004/08/26 22:38:47 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v 1.44 2004/12/09 00:21:05 mvojkovi Exp $ */
#include "nv_include.h"
@@ -407,7 +407,7 @@ NVCommonSetup(ScrnInfoPtr pScrn)
case 0x017D:
case 0x0186:
case 0x0187:
- case 0x0189:
+ case 0x018D:
case 0x0286:
case 0x028C:
case 0x0316:
@@ -432,12 +432,10 @@ NVCommonSetup(ScrnInfoPtr pScrn)
case 0x0160:
case 0x0166:
case 0x00C8:
- case 0x00C9:
case 0x00CC:
- case 0x0147:
+ case 0x0144:
+ case 0x0146:
case 0x0148:
- case 0x0149:
- case 0x014C:
mobile = TRUE;
break;
default: