diff options
| author | Mark Vojkovich <markv@xfree86.org> | 2006-06-29 18:41:44 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2006-06-29 18:41:44 -0700 |
| commit | 6265b77dc8878e36abd76b73e209a2d76d70ba22 (patch) | |
| tree | 4dd9882775e9dfef3fa144fc339af6bfc046d7e1 /src/nv_hw.c | |
| parent | 5114639dff73c22845451acffed94f1da284a7df (diff) | |
New chip support and new PCI IDs.
Diffstat (limited to 'src/nv_hw.c')
| -rw-r--r-- | src/nv_hw.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/nv_hw.c b/src/nv_hw.c index dd4a8f8..ab703f1 100644 --- a/src/nv_hw.c +++ b/src/nv_hw.c @@ -36,7 +36,7 @@ |* those rights set forth herein. *| |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c,v 1.20 2006/01/21 01:17:59 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c,v 1.21 2006/06/16 00:19:33 mvojkovi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -882,8 +882,10 @@ void NVCalcStateExt ( case NV_ARCH_20: case NV_ARCH_30: default: - if((pNv->Chipset & 0xfff0) == 0x0240) { - state->arbitration0 = 256; + if(((pNv->Chipset & 0xfff0) == 0x0240) || + ((pNv->Chipset & 0xfff0) == 0x03D0)) + { + state->arbitration0 = 128; state->arbitration1 = 0x0480; } else if(((pNv->Chipset & 0xffff) == 0x01A0) || @@ -957,7 +959,8 @@ void NVLoadStateExt ( if(((pNv->Chipset & 0xfff0) == 0x0090) || ((pNv->Chipset & 0xfff0) == 0x01D0) || ((pNv->Chipset & 0xfff0) == 0x0290) || - ((pNv->Chipset & 0xfff0) == 0x0390)) + ((pNv->Chipset & 0xfff0) == 0x0390) || + ((pNv->Chipset & 0xfff0) == 0x03D0)) { regions = 15; } @@ -1213,6 +1216,7 @@ void NVLoadStateExt ( case 0x0160: case 0x01D0: case 0x0240: + case 0x03D0: pNv->PMC[0x1700/4] = pNv->PFB[0x020C/4]; pNv->PMC[0x1704/4] = 0; pNv->PMC[0x1708/4] = 0; @@ -1291,7 +1295,8 @@ void NVLoadStateExt ( if(((pNv->Chipset & 0xfff0) == 0x0090) || ((pNv->Chipset & 0xfff0) == 0x01D0) || ((pNv->Chipset & 0xfff0) == 0x0290) || - ((pNv->Chipset & 0xfff0) == 0x0390)) + ((pNv->Chipset & 0xfff0) == 0x0390) || + ((pNv->Chipset & 0xfff0) == 0x03D0)) { for(i = 0; i < 60; i++) { pNv->PGRAPH[(0x0D00/4) + i] = pNv->PFB[(0x0600/4) + i]; |