diff options
author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-07-09 16:51:58 +0000 |
---|---|---|
committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-07-09 16:51:58 +0000 |
commit | 80ac36ec4fbbd9a4aae1bde01fe6ebc1088fa8cb (patch) | |
tree | ef4fb3b3e269a4e040e1acac85e731522cf74abc /src/nv_driver.c | |
parent | 6b75bc13462f1cfb735fe1de359ed9e45b5f4415 (diff) |
Bug #3740 <https://bugs.freedesktop.org/show_bug.cgi?id=3740> Patch #3058
<https://bugs.freedesktop.org/attachment.cgi?id=3058>
08-Jul-2005 nv driver updates from Mark Vojkovich:
Change some console restore code for NV11. Hopefully, we can more reliably
restore the console for desktop systems using DVI. This may correct a
recent regression on NV11.
Also, new PCI IDs.
Add new nVidia PCI ids to match nv_driver.c changes.
Diffstat (limited to 'src/nv_driver.c')
-rw-r--r-- | src/nv_driver.c | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/src/nv_driver.c b/src/nv_driver.c index 9f5d198..22beb74 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -25,7 +25,7 @@ /* Hacked together from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen <jpaana@s2.org> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.134 2005/04/24 18:57:35 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.135 2005/07/09 00:53:00 mvojkovi Exp $ */ #include "nv_include.h" @@ -233,6 +233,7 @@ static SymTabRec NVKnownChipsets[] = { 0x10DE0042, "GeForce 6800 LE" }, { 0x10DE0043, "0x0043" }, { 0x10DE0045, "GeForce 6800 GT" }, + { 0x10DE0046, "GeForce 6800 GT" }, { 0x10DE0049, "0x0049" }, { 0x10DE004E, "Quadro FX 4000" }, @@ -242,19 +243,19 @@ static SymTabRec NVKnownChipsets[] = { 0x10DE00C8, "GeForce Go 6800" }, { 0x10DE00C9, "GeForce Go 6800 Ultra" }, { 0x10DE00CC, "Quadro FX Go1400" }, - { 0x10DE00CD, "0x00CD" }, + { 0x10DE00CD, "Quadro FX 3450/4000 SDI" }, { 0x10DE00CE, "Quadro FX 1400" }, { 0x10DE0140, "GeForce 6600 GT" }, { 0x10DE0141, "GeForce 6600" }, - { 0x10DE0142, "0x0142" }, + { 0x10DE0142, "GeForce 6600 LE" }, { 0x10DE0143, "0x0143" }, { 0x10DE0144, "GeForce Go 6600" }, { 0x10DE0145, "GeForce 6610 XL" }, { 0x10DE0146, "GeForce Go 6600 TE/6200 TE" }, - { 0x10DE0147, "0x0147" }, + { 0x10DE0147, "GeForce 6700 XL" }, { 0x10DE0148, "GeForce Go 6600" }, - { 0x10DE0149, "0x0149" }, + { 0x10DE0149, "GeForce Go 6600 GT" }, { 0x10DE014B, "0x014B" }, { 0x10DE014C, "0x014C" }, { 0x10DE014D, "0x014D" }, @@ -263,13 +264,13 @@ static SymTabRec NVKnownChipsets[] = { 0x10DE0160, "0x0160" }, { 0x10DE0161, "GeForce 6200 TurboCache(TM)" }, - { 0x10DE0162, "0x0162" }, + { 0x10DE0162, "GeForce 6200SE TurboCache(TM)" }, { 0x10DE0163, "0x0163" }, { 0x10DE0164, "GeForce Go 6200" }, - { 0x10DE0165, "0x0163" }, - { 0x10DE0166, "GeForce Go 6250" }, + { 0x10DE0165, "Quadro NVS 285" }, + { 0x10DE0166, "GeForce Go 6400" }, { 0x10DE0167, "GeForce Go 6200" }, - { 0x10DE0168, "GeForce Go 6250" }, + { 0x10DE0168, "GeForce Go 6400" }, { 0x10DE0169, "0x0169" }, { 0x10DE016B, "0x016B" }, { 0x10DE016C, "0x016C" }, @@ -282,10 +283,21 @@ static SymTabRec NVKnownChipsets[] = { 0x10DE0215, "GeForce 6800 GT" }, { 0x10DE0220, "0x0220" }, - { 0x10DE0221, "0x0221" }, + { 0x10DE0221, "GeForce 6200" }, { 0x10DE0222, "0x0222" }, { 0x10DE0228, "0x0228" }, + { 0x10DE0090, "0x0090" }, + { 0x10DE0091, "GeForce 7800 GTX" }, + { 0x10DE0092, "0x0092" }, + { 0x10DE0093, "0x0093" }, + { 0x10DE0094, "0x0094" }, + { 0x10DE0098, "0x0098" }, + { 0x10DE0099, "GeForce Go 7800 GTX" }, + { 0x10DE009C, "0x009C" }, + { 0x10DE009D, "Quadro FX 4500" }, + { 0x10DE009E, "0x009E" }, + {-1, NULL} }; |