diff options
| author | Roland Mainz <roland.mainz@nrubsig.org> | 2004-12-16 01:42:35 +0000 |
|---|---|---|
| committer | Roland Mainz <roland.mainz@nrubsig.org> | 2004-12-16 01:42:35 +0000 |
| commit | 9ec40b5af9d910fabb047906fcfd768777b74ffe (patch) | |
| tree | 9e97fea0ecc3dbadc0ed3c038d8ef504a65de5bf /src/nv_setup.c | |
| parent | 2b3cb71eb2cdd71bda3e3e0072fc3df9f111e0a4 (diff) | |
xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dac.cXORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8-branch
xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c
xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c
xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c
//bugs.freedesktop.org/show_bug.cgi?id=1985) attachment #1504
(https://bugs.freedesktop.org/attachment.cgi?id=1504) sync to 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.c | 10 |
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: |