summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2007-05-16 13:51:32 +1000
committerBen Skeggs <skeggsb@gmail.com>2007-05-16 13:51:32 +1000
commit11d45369317611b42e8a5eb846978542f9ade162 (patch)
tree526dc0048c7ebe5073e3fe625d3860292a7c4971
parentd1278980bd9d3beb77f63c173446b03d7deee0f2 (diff)
downloadxorg-driver-xf86-video-nouveau-11d45369317611b42e8a5eb846978542f9ade162.tar.gz
NV50: Add NV_ARCH/CHIPSET defines for G80/G84
-rw-r--r--src/nv_driver.c4
-rw-r--r--src/nv_type.h3
2 files changed, 7 insertions, 0 deletions
diff --git a/src/nv_driver.c b/src/nv_driver.c
index cb018be..d582078 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -1546,6 +1546,10 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
case CHIPSET_C512: /* Geforce 6100 (nForce 4xx) */
pNv->Architecture = NV_ARCH_40;
break;
+ case CHIPSET_NV50:
+ case CHIPSET_NV84:
+ pNv->Architecture = NV_ARCH_50;
+ break;
default: /* Unknown, probably >=NV40 */
pNv->Architecture = NV_ARCH_40;
break;
diff --git a/src/nv_type.h b/src/nv_type.h
index bb85b8f..046d2eb 100644
--- a/src/nv_type.h
+++ b/src/nv_type.h
@@ -28,6 +28,7 @@
#define NV_ARCH_20 0x20
#define NV_ARCH_30 0x30
#define NV_ARCH_40 0x40
+#define NV_ARCH_50 0x50
#define CHIPSET_NV03 0x0010
#define CHIPSET_NV04 0x0020
@@ -52,6 +53,8 @@
#define CHIPSET_NV44 0x0160
#define CHIPSET_NV44A 0x0220
#define CHIPSET_NV45 0x0210
+#define CHIPSET_NV50 0x0190
+#define CHIPSET_NV84 0x0400
#define CHIPSET_MISC_BRIDGED 0x00F0
#define CHIPSET_G70 0x0090
#define CHIPSET_G71 0x0290