From: Dave Airlie <airlied@redhat.com>
Date: Sun, 2 Nov 2008 23:58:12 +0000 (+1000)
Subject: radeon: make build again
X-Git-Tag: libdrm-2.4.3~16^2~20^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=68fcb7770efc20b9e27b1724e2fb5ac112a5330e;p=platform%2Fupstream%2Flibdrm.git

radeon: make build again
---

diff --git a/linux-core/radeon_drv.c b/linux-core/radeon_drv.c
index f788172..f419468 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 7191478..9a1e0e0 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 4a23196..3dde321 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 c6ebf9b..a95ab15 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,