summaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/radeon_drv.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2006-03-19 10:01:37 +0100
committerDave Airlie <airlied@linux.ie>2006-03-19 10:01:37 +0100
commitdfab11542fbecd8539c092fe36155909b4812f73 (patch)
treec96ad45aad247e9e0c8091a1d3550ead9eebb97b /drivers/char/drm/radeon_drv.h
parentdrm: Add general-purpose packet for manipulating scratch registers (r300) (diff)
downloadlinux-dfab11542fbecd8539c092fe36155909b4812f73.tar.xz
linux-dfab11542fbecd8539c092fe36155909b4812f73.zip
drm: rationalise some pci ids
This is the start of some work from Roland Scheidegger to align the X DDX pci ids and the drm ones, however we don't want to put r300 ids in the kernel just yet, they destabilise a few machines. From: Roland Scheidegger (via DRM CVS) Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/radeon_drv.h')
-rw-r--r--drivers/char/drm/radeon_drv.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h
index 5cf555e4637b..31bacfa2edee 100644
--- a/drivers/char/drm/radeon_drv.h
+++ b/drivers/char/drm/radeon_drv.h
@@ -103,20 +103,21 @@
*/
enum radeon_family {
CHIP_R100,
- CHIP_RS100,
CHIP_RV100,
+ CHIP_RS100,
CHIP_RV200,
- CHIP_R200,
CHIP_RS200,
- CHIP_R250,
- CHIP_RS250,
+ CHIP_R200,
CHIP_RV250,
+ CHIP_RS300,
CHIP_RV280,
CHIP_R300,
- CHIP_RS300,
CHIP_R350,
CHIP_RV350,
+ CHIP_RV380,
CHIP_R420,
+ CHIP_RV410,
+ CHIP_RS400,
CHIP_LAST,
};