summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRune Petersen <[email protected]>2005-02-12 21:29:51 +0000
committerRune Petersen <[email protected]>2005-02-12 21:29:51 +0000
commit32713903628bc4e6af56c9d32475cd9e1c90f4c3 (patch)
treeecebfb97aef305185f9a27ae19e64e869e29e5ca
parent37cbb521d3ab8d96a8fcc0199424c0ddc70f0435 (diff)
initial r400 support: r400 cards are treated as RV350 for now.
-rw-r--r--src/mesa/drivers/dri/r300/radeon_screen.c5
-rw-r--r--src/mesa/drivers/dri/r300/radeon_screen.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/r300/radeon_screen.c b/src/mesa/drivers/dri/r300/radeon_screen.c
index c6c52c11df1..aab5ac425fd 100644
--- a/src/mesa/drivers/dri/r300/radeon_screen.c
+++ b/src/mesa/drivers/dri/r300/radeon_screen.c
@@ -203,6 +203,7 @@ static const struct dri_debug_control debug_control[] = {
#define PCI_CHIP_R300_NF 0x4E46
#define PCI_CHIP_R300_NG 0x4E47
#define PCI_CHIP_R350_NH 0x4E48
+#define PCI_CHIP_R420_JK 0x4a4b
#endif
#ifdef USE_NEW_INTERFACE
@@ -382,6 +383,10 @@ static radeonScreenPtr radeonCreateScreen(__DRIscreenPrivate * sPriv)
screen->chipset = RADEON_CHIP_R300;
break;
+ case PCI_CHIP_R420_JK:
+ screen->chipset = RADEON_CHIP_R420;
+ break;
+
default:
fprintf(stderr,
"Unknown device ID %04X, please report. Assuming plain R300.\n",
diff --git a/src/mesa/drivers/dri/r300/radeon_screen.h b/src/mesa/drivers/dri/r300/radeon_screen.h
index a1a019162ab..ac8471feaa3 100644
--- a/src/mesa/drivers/dri/r300/radeon_screen.h
+++ b/src/mesa/drivers/dri/r300/radeon_screen.h
@@ -54,6 +54,7 @@ typedef struct {
#define RADEON_CHIP_REAL_R200 1
#define RADEON_CHIP_R300 2
#define RADEON_CHIP_RV350 3
+#define RADEON_CHIP_R420 4
#define RADEON_CHIP_MASK 0x0f
#define RADEON_CHIPSET_TCL (1 << 8)