summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2005-01-27 09:13:42 +0000
committerDave Airlie <airlied@linux.ie>2005-01-27 09:13:42 +0000
commit77045dc51672715115f179c099dfb8d7b4d304d4 (patch)
tree8fb44fed51659e0a7ce4e3e9577f9efc518099f3
parent43c3223de690b892759901386d8dc936b0dfbad1 (diff)
fix incorrect PCI id for ATI radeon
-rw-r--r--shared-core/drm_pciids.txt2
-rw-r--r--shared-core/radeon_drv.h1
-rw-r--r--shared-core/radeon_state.c1
3 files changed, 2 insertions, 2 deletions
diff --git a/shared-core/drm_pciids.txt b/shared-core/drm_pciids.txt
index 962fcd2c..d8196ca1 100644
--- a/shared-core/drm_pciids.txt
+++ b/shared-core/drm_pciids.txt
@@ -13,7 +13,7 @@
0x1002 0x4156 CHIP_RV350 "ATI FireGL AV T2"
0x1002 0x4237 CHIP_RS250|CHIP_IS_IGP "ATI Radeon RS250 IGP"
0x1002 0x4242 CHIP_R200 "ATI Radeon BB R200 AIW 8500DV"
-0x1002 0x4242 CHIP_R200 "ATI Radeon BC R200"
+0x1002 0x4243 CHIP_R200 "ATI Radeon BC R200"
0x1002 0x4336 CHIP_RS100|CHIP_IS_IGP|CHIP_IS_MOBILITY "ATI Radeon RS100 Mobility U1"
0x1002 0x4337 CHIP_RS200|CHIP_IS_IGP|CHIP_IS_MOBILITY "ATI Radeon RS200 Mobility IGP 340M"
0x1002 0x4437 CHIP_RS250|CHIP_IS_IGP|CHIP_IS_MOBILITY "ATI Radeon RS250 Mobility IGP"
diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h
index bb1d30b2..6b48686b 100644
--- a/shared-core/radeon_drv.h
+++ b/shared-core/radeon_drv.h
@@ -866,7 +866,6 @@ do { \
extern int RADEON_READ_PLL(drm_device_t * dev, int addr);
extern int radeon_preinit(struct drm_device *dev, unsigned long flags);
-extern int radeon_postinit(struct drm_device *dev, unsigned long flags);
extern int radeon_postcleanup(struct drm_device *dev);
#define CP_PACKET0( reg, n ) \
diff --git a/shared-core/radeon_state.c b/shared-core/radeon_state.c
index c9eaf06e..11d4000a 100644
--- a/shared-core/radeon_state.c
+++ b/shared-core/radeon_state.c
@@ -2952,6 +2952,7 @@ int radeon_driver_open_helper(drm_device_t * dev, drm_file_t * filp_priv)
drm_radeon_private_t *dev_priv = dev->dev_private;
struct drm_radeon_driver_file_fields *radeon_priv;
+ DRM_DEBUG("\n");
radeon_priv =
(struct drm_radeon_driver_file_fields *)
drm_alloc(sizeof(*radeon_priv), DRM_MEM_FILES);