summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-11-03 09:58:12 +1000
committerDave Airlie <airlied@redhat.com>2008-11-03 09:58:12 +1000
commit68fcb7770efc20b9e27b1724e2fb5ac112a5330e (patch)
tree693fd99df1f08d87d1b91930328a548d797e4e99
parentb7108445c9ebb37d06fcc7821e984124fda928f3 (diff)
radeon: make build again
-rw-r--r--linux-core/radeon_drv.c2
-rw-r--r--shared-core/radeon_cp.c9
-rw-r--r--shared-core/radeon_cs.c2
-rw-r--r--shared-core/radeon_drv.h1
4 files changed, 3 insertions, 11 deletions
diff --git a/linux-core/radeon_drv.c b/linux-core/radeon_drv.c
index f7881720..f4194688 100644
--- a/linux-core/radeon_drv.c
+++ b/linux-core/radeon_drv.c
@@ -44,7 +44,7 @@ int radeon_agpmode = 0;
MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers\n");
module_param_named(no_wb, radeon_no_wb, int, 0444);
-unsigned int radeon_modeset = 0;
+int radeon_modeset = 0;
module_param_named(modeset, radeon_modeset, int, 0400);
MODULE_PARM_DESC(dynclks, "Disable/Enable dynamic clocks");
diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index 71914782..9a1e0e02 100644
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
@@ -2793,15 +2793,6 @@ int radeon_driver_firstopen(struct drm_device *dev)
dev_priv->gart_info.table_size = RADEON_PCIGART_TABLE_SIZE;
- if (!drm_core_check_feature(dev, DRIVER_MODESET))
- radeon_gem_mm_init(dev);
-
- ret = drm_addmap(dev, dev_priv->fb_aper_offset,
- drm_get_resource_len(dev, 0), _DRM_FRAME_BUFFER,
- _DRM_WRITE_COMBINING, &map);
- if (ret != 0)
- return ret;
-
return 0;
}
diff --git a/shared-core/radeon_cs.c b/shared-core/radeon_cs.c
index 4a231962..3dde321d 100644
--- a/shared-core/radeon_cs.c
+++ b/shared-core/radeon_cs.c
@@ -313,7 +313,7 @@ static __inline__ int radeon_cs_relocate_packet0(struct drm_radeon_cs_parser *pa
case R200_PP_TXOFFSET_1:
case RADEON_PP_TXOFFSET_0:
case RADEON_PP_TXOFFSET_1:
- ret = dev_priv->cs.relocate(parser. ib_chunk->kdata + offset_dw + 2, &offset);
+ ret = dev_priv->cs.relocate(parser, ib_chunk->kdata + offset_dw + 2, &offset);
if (ret)
return ret;
diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h
index c6ebf9b6..a95ab152 100644
--- a/shared-core/radeon_drv.h
+++ b/shared-core/radeon_drv.h
@@ -124,6 +124,7 @@ enum radeon_family {
CHIP_RV350,
CHIP_RV380,
CHIP_R420,
+ CHIP_R423,
CHIP_RV410,
CHIP_RS400,
CHIP_RS480,