X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fchar%2Fdrm%2Fradeon_drv.h;h=1f7d2ab8c4fcb4de415f046f09fd65fe966f9164;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=78345cee8f8ecfd4aa2976781ee86df86efbce94;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h
index 78345cee8..1f7d2ab8c 100644
--- a/drivers/char/drm/radeon_drv.h
+++ b/drivers/char/drm/radeon_drv.h
@@ -38,7 +38,7 @@
 
 #define DRIVER_NAME		"radeon"
 #define DRIVER_DESC		"ATI Radeon"
-#define DRIVER_DATE		"20060225"
+#define DRIVER_DATE		"20051229"
 
 /* Interface history:
  *
@@ -91,11 +91,9 @@
  * 1.20- Add support for r300 texrect
  * 1.21- Add support for card type getparam
  * 1.22- Add support for texture cache flushes (R300_TX_CNTL)
- * 1.23- Add new radeon memory map work from benh
- * 1.24- Add general-purpose packet for manipulating scratch registers (r300)
  */
 #define DRIVER_MAJOR		1
-#define DRIVER_MINOR		24
+#define DRIVER_MINOR		22
 #define DRIVER_PATCHLEVEL	0
 
 /*
@@ -103,21 +101,20 @@
  */
 enum radeon_family {
 	CHIP_R100,
-	CHIP_RV100,
 	CHIP_RS100,
+	CHIP_RV100,
 	CHIP_RV200,
-	CHIP_RS200,
 	CHIP_R200,
+	CHIP_RS200,
+	CHIP_R250,
+	CHIP_RS250,
 	CHIP_RV250,
-	CHIP_RS300,
 	CHIP_RV280,
 	CHIP_R300,
+	CHIP_RS300,
 	CHIP_R350,
 	CHIP_RV350,
-	CHIP_RV380,
 	CHIP_R420,
-	CHIP_RV410,
-	CHIP_RS400,
 	CHIP_LAST,
 };
 
@@ -139,11 +136,9 @@ enum radeon_chip_flags {
 	CHIP_IS_AGP = 0x00080000UL,
 	CHIP_HAS_HIERZ = 0x00100000UL,
 	CHIP_IS_PCIE = 0x00200000UL,
-	CHIP_NEW_MEMMAP = 0x00400000UL,
 };
 
-#define GET_RING_HEAD(dev_priv)	(dev_priv->writeback_works ? \
-        DRM_READ32(  (dev_priv)->ring_rptr, 0 ) : RADEON_READ(RADEON_CP_RB_RPTR))
+#define GET_RING_HEAD(dev_priv)		DRM_READ32(  (dev_priv)->ring_rptr, 0 )
 #define SET_RING_HEAD(dev_priv,val)	DRM_WRITE32( (dev_priv)->ring_rptr, 0, (val) )
 
 typedef struct drm_radeon_freelist {
@@ -204,8 +199,6 @@ typedef struct drm_radeon_private {
 	drm_radeon_sarea_t *sarea_priv;
 
 	u32 fb_location;
-	u32 fb_size;
-	int new_memmap;
 
 	int gart_size;
 	u32 gart_vm_start;
@@ -279,8 +272,6 @@ typedef struct drm_radeon_private {
 	unsigned long pcigart_offset;
 	drm_ati_pcigart_info gart_info;
 
-	u32 scratch_ages[5];
-
 	/* starting from here on, data is preserved accross an open */
 	uint32_t flags;		/* see radeon_chip_flags */
 } drm_radeon_private_t;