First step of Radeon DRI unification:

- Makes all three drivers use the same screen structure and setup code, with a
  few ifdefs for the separate compilation to deal with symbols not being
  available to all drivers and the fact that we have no mechanism for dealing
  with different config options for different chip families in the same driver.
  These issues should be dealt with later.
- Introduces IS_R[123]00_CLASS(radeonScreenPtr) macro for code for taking
  different paths depending on the general class of chipset.
- Adds many new R300-class PCI IDs, though not all those listed in
  radeon_driver.c.

12 files changed, 33 insertions, 1036 deletions

diff --git a/src/mesa/drivers/dri/r300/Makefile b/src/mesa/drivers/dri/r300/Makefile
index 29dd20860c8..41ffb59ab05 100644
--- a/src/mesa/drivers/dri/r300/Makefile
+++ b/src/mesa/drivers/dri/r300/Makefile
@@ -65,6 +65,8 @@ C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
 X86_SOURCES = 
 #r200_vtxtmp_x86.S
 
+DEFINES += -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300
+
 SYMLINKS = \
 	server/radeon_dri.c \
 	server/radeon_dri.h \
@@ -73,6 +75,11 @@ SYMLINKS = \
 	server/radeon_reg.h \
 	server/radeon_egl.c
 
+COMMON_SYMLINKS = \
+	radeon_chipset.h \
+	radeon_screen.c \
+	radeon_screen.h
+
 ##### TARGETS #####
 
 
@@ -82,5 +89,8 @@ $(SYMLINKS):
 	mkdir -p server
 	for i in $(SYMLINKS) ; do rm -f $$i && test -f ../radeon/$$i && ln -s ../../radeon/$$i $$i ; done
 
-symlinks: $(SYMLINKS)
+$(COMMON_SYMLINKS):
+	@[ -e $@ ] || ln -sf ../radeon/$@ ./
+
+symlinks: $(SYMLINKS) $(COMMON_SYMLINKS)
 
diff --git a/src/mesa/drivers/dri/r300/r200_context.h b/src/mesa/drivers/dri/r300/r200_context.h
index 2c1eda33f79..a06d7152d78 100644
--- a/src/mesa/drivers/dri/r300/r200_context.h
+++ b/src/mesa/drivers/dri/r300/r200_context.h
@@ -766,7 +766,7 @@ struct r200_context {
 	/* Texture object bookkeeping
 	 */
 	unsigned nr_heaps;
-	driTexHeap *texture_heaps[R200_NR_TEX_HEAPS];
+	driTexHeap *texture_heaps[RADEON_NR_TEX_HEAPS];
 	driTextureObject swapped;
 	int texture_depth;
 	float initialMaxAnisotropy;
diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index a67d800fe60..9c089e40053 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -218,7 +218,7 @@ GLboolean r300CreateContext(const __GLcontextModes * glVisual,
 	make_empty_list(&r300->swapped);
 
 	r300->nr_heaps = 1 /* screen->numTexHeaps */ ;
-	assert(r300->nr_heaps < R200_NR_TEX_HEAPS);
+	assert(r300->nr_heaps < RADEON_NR_TEX_HEAPS);
 	for (i = 0; i < r300->nr_heaps; i++) {
 		r300->texture_heaps[i] = driCreateTextureHeap(i, r300,
 							       screen->
@@ -355,9 +355,9 @@ GLboolean r300CreateContext(const __GLcontextModes * glVisual,
 #endif
 	}
 	if (tcl_mode == DRI_CONF_TCL_SW ||
-	    !(r300->radeon.radeonScreen->chipset & RADEON_CHIPSET_TCL)) {
-		if (r300->radeon.radeonScreen->chipset & RADEON_CHIPSET_TCL) {
-			r300->radeon.radeonScreen->chipset &= ~RADEON_CHIPSET_TCL;
+	    !(r300->radeon.radeonScreen->chip_flags & RADEON_CHIPSET_TCL)) {
+		if (r300->radeon.radeonScreen->chip_flags & RADEON_CHIPSET_TCL) {
+			r300->radeon.radeonScreen->chip_flags &= ~RADEON_CHIPSET_TCL;
 			fprintf(stderr, "Disabling HW TCL support\n");
 		}
 		TCL_FALLBACK(r300->radeon.glCtx, RADEON_TCL_FALLBACK_TCL_DISABLE, 1);
diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index ac4bf86afdf..2ceee563d16 100644
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@ -831,7 +831,7 @@ struct r300_context {
 	/* Texture object bookkeeping
 	 */
 	unsigned nr_heaps;
-	driTexHeap *texture_heaps[R200_NR_TEX_HEAPS];
+	driTexHeap *texture_heaps[RADEON_NR_TEX_HEAPS];
 	driTextureObject swapped;
 	int texture_depth;
 	float initialMaxAnisotropy;
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 913602668c9..4422a233367 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -1992,7 +1992,7 @@ void r300ResetHwState(r300ContextPtr r300)
 	r300->hw.unk2220.cmd[3] = r300PackFloat32(1.0);
 	r300->hw.unk2220.cmd[4] = r300PackFloat32(1.0);
 
-	if (GET_CHIP(r300->radeon.radeonScreen) == RADEON_CHIP_R300)
+	if (r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_R300)
 		r300->hw.unk2288.cmd[1] = R300_2288_R300;
 	else
 		r300->hw.unk2288.cmd[1] = R300_2288_RV350;
@@ -2014,11 +2014,11 @@ void r300ResetHwState(r300ContextPtr r300)
 
 	r300->hw.gb_misc.cmd[R300_GB_MISC_MSPOS_0] = 0x66666666;
 	r300->hw.gb_misc.cmd[R300_GB_MISC_MSPOS_1] = 0x06666666;
-	if (GET_CHIP(r300->radeon.radeonScreen) == RADEON_CHIP_R300)
+	if (r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_R300)
 		r300->hw.gb_misc.cmd[R300_GB_MISC_TILE_CONFIG] = R300_GB_TILE_ENABLE
 							| R300_GB_TILE_PIPE_COUNT_R300
 							| R300_GB_TILE_SIZE_16;
-	else if (GET_CHIP(r300->radeon.radeonScreen) == RADEON_CHIP_R420)
+	else if (r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_R420)
 		r300->hw.gb_misc.cmd[R300_GB_MISC_TILE_CONFIG] = R300_GB_TILE_ENABLE
 							| R300_GB_TILE_PIPE_COUNT_R420
 							| R300_GB_TILE_SIZE_16;
diff --git a/src/mesa/drivers/dri/r300/radeon_context.c b/src/mesa/drivers/dri/r300/radeon_context.c
index 97507617cd7..c045e80602f 100644
--- a/src/mesa/drivers/dri/r300/radeon_context.c
+++ b/src/mesa/drivers/dri/r300/radeon_context.c
@@ -78,7 +78,7 @@ static const GLubyte *radeonGetString(GLcontext * ctx, GLenum name)
 			radeon->radeonScreen->AGPMode;
 		const char* chipname;
 
-		if (IS_FAMILY_R300(radeon))
+		if (IS_R300_CLASS(radeon->radeonScreen))
 			chipname = "R300";
 		else
 			chipname = "R200";
@@ -261,7 +261,7 @@ GLboolean radeonMakeCurrent(__DRIcontextPrivate * driContextPriv,
 			radeon->dri.drawable = driDrawPriv;
 			
 #if R200_MERGED
-			if (IS_FAMILY_R200(radeon)) {
+			if (IS_R200_CLASS(radeon->radeonScreen)) {
 				r200UpdateWindow(radeon->glCtx);
 				r200UpdateViewportOffset(radeon->glCtx);
 			}
@@ -282,7 +282,7 @@ GLboolean radeonMakeCurrent(__DRIcontextPrivate * driContextPriv,
 		_mesa_update_state(radeon->glCtx);
 
 #if R200_MERGED
-		if (IS_FAMILY_R200(radeon))
+		if (IS_R200_CLASS(radeon->radeonScreen))
 			r200ValidateState(radeon->glCtx);
 #endif
 		
diff --git a/src/mesa/drivers/dri/r300/radeon_ioctl.c b/src/mesa/drivers/dri/r300/radeon_ioctl.c
index 4eee2e38878..f7a217c1aae 100644
--- a/src/mesa/drivers/dri/r300/radeon_ioctl.c
+++ b/src/mesa/drivers/dri/r300/radeon_ioctl.c
@@ -163,7 +163,7 @@ void radeonCopyBuffer(const __DRIdrawablePrivate * dPriv)
 			(void *)radeon->glCtx);
 	}
 
-	if (IS_FAMILY_R200(radeon))
+	if (IS_R200_CLASS(radeon->radeonScreen))
 		R200_FIREVERTICES((r200ContextPtr)radeon);
 	else
 		r300Flush(radeon->glCtx);
@@ -205,7 +205,7 @@ void radeonCopyBuffer(const __DRIdrawablePrivate * dPriv)
 
 	UNLOCK_HARDWARE(radeon);
 
-	if (IS_FAMILY_R200(radeon))
+	if (IS_R200_CLASS(radeon->radeonScreen))
 		((r200ContextPtr)radeon)->hw.all_dirty = GL_TRUE;
 	else
 		((r300ContextPtr)radeon)->hw.all_dirty = GL_TRUE;
@@ -239,7 +239,7 @@ void radeonPageFlip(const __DRIdrawablePrivate * dPriv)
 			radeon->sarea->pfCurrentPage);
 	}
 
-	if (IS_FAMILY_R200(radeon))
+	if (IS_R200_CLASS(radeon->radeonScreen))
 		R200_FIREVERTICES((r200ContextPtr)radeon);
 	else
 		r300Flush(radeon->glCtx);
@@ -296,7 +296,7 @@ void radeonPageFlip(const __DRIdrawablePrivate * dPriv)
 		radeon->state.color.drawPitch = radeon->radeonScreen->backPitch;
 	}
 
-	if (IS_FAMILY_R200(radeon)) {
+	if (IS_R200_CLASS(radeon->radeonScreen)) {
 		r200ContextPtr r200 = (r200ContextPtr)radeon;
 
 		R200_STATECHANGE(r200, ctx);
@@ -304,7 +304,7 @@ void radeonPageFlip(const __DRIdrawablePrivate * dPriv)
 			+ radeon->radeonScreen->fbLocation;
 		r200->hw.ctx.cmd[CTX_RB3D_COLORPITCH] = radeon->state.color.drawPitch;
 	}
-	if (IS_FAMILY_R300(radeon)) {
+	if (IS_R300_CLASS(radeon->radeonScreen)) {
 		r300ContextPtr r300 = (r300ContextPtr)radeon;
 		R300_STATECHANGE(r300, cb);
 		r300->hw.cb.cmd[R300_CB_OFFSET] = r300->radeon.state.color.drawOffset + 
@@ -350,7 +350,7 @@ void radeonFlush(GLcontext * ctx)
 {
 	radeonContextPtr radeon = RADEON_CONTEXT(ctx);
 
-	if (IS_FAMILY_R300(radeon))
+	if (IS_R300_CLASS(radeon->radeonScreen))
 		r300Flush(ctx);
 #if R200_MERGED
 	else
diff --git a/src/mesa/drivers/dri/r300/radeon_lock.c b/src/mesa/drivers/dri/r300/radeon_lock.c
index 5f90f5f32e5..2af38909bc2 100644
--- a/src/mesa/drivers/dri/r300/radeon_lock.c
+++ b/src/mesa/drivers/dri/r300/radeon_lock.c
@@ -163,7 +163,7 @@ void radeonGetLock(radeonContextPtr radeon, GLuint flags)
 	if (sarea->ctx_owner != radeon->dri.hwContext)
 		sarea->ctx_owner = radeon->dri.hwContext;
 
-	if (IS_FAMILY_R300(radeon))
+	if (IS_R300_CLASS(radeon->radeonScreen))
 		r300RegainedLock(radeon);
 #if R200_MERGED
 	else
diff --git a/src/mesa/drivers/dri/r300/radeon_lock.h b/src/mesa/drivers/dri/r300/radeon_lock.h
index c9acbce0c32..c7c75ae862a 100644
--- a/src/mesa/drivers/dri/r300/radeon_lock.h
+++ b/src/mesa/drivers/dri/r300/radeon_lock.h
@@ -103,7 +103,7 @@ extern int prevLockLine;
 			(radeon)->dri.hwLock,				\
 			(radeon)->dri.hwContext );			\
 		DEBUG_RESET();						\
-		if (IS_FAMILY_R200((radeon))) {				\
+		if (IS_R200_CLASS(radeon->radeonScreen)) {		\
 			r200ContextPtr __r200 = (r200ContextPtr)(radeon); \
 			if (__r200->save_on_next_unlock)		\
 				r200SaveHwState( __r200 );		\
diff --git a/src/mesa/drivers/dri/r300/radeon_screen.c b/src/mesa/drivers/dri/r300/radeon_screen.c
deleted file mode 100644
index 37b5235f2cf..00000000000
--- a/src/mesa/drivers/dri/r300/radeon_screen.c
+++ /dev/null
@@ -1,900 +0,0 @@
-/*
-Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
-
-The Weather Channel (TM) funded Tungsten Graphics to develop the
-initial release of the Radeon 8500 driver under the XFree86 license.
-This notice must be preserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/**
- * \file radeon_screen.c
- * Screen initialization functions for the R200 driver.
- *
- * \author Keith Whitwell <[email protected]>
- */
-
-#include <dlfcn.h>
-
-#include "glheader.h"
-#include "imports.h"
-#include "context.h"
-#include "mtypes.h"
-#include "framebuffer.h"
-#include "renderbuffer.h"
-
-#define STANDALONE_MMIO
-#include "radeon_screen.h"
-#include "r200_context.h"
-#include "r300_context.h"
-#include "radeon_ioctl.h"
-#include "r200_ioctl.h"
-#include "radeon_macros.h"
-#include "radeon_reg.h"
-#include "radeon_span.h"
-
-#include "utils.h"
-#include "vblank.h"
-#include "GL/internal/dri_interface.h"
-#include "drirenderbuffer.h"
-
-/* R200 configuration
- */
-#include "xmlpool.h"
-
-const char __driR200ConfigOptions[] =
-DRI_CONF_BEGIN
-	DRI_CONF_SECTION_PERFORMANCE
-		DRI_CONF_TCL_MODE(DRI_CONF_TCL_CODEGEN)
-		DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS)
-		DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_0)
-		DRI_CONF_MAX_TEXTURE_UNITS(4, 2, 6)
-	DRI_CONF_SECTION_END
-	DRI_CONF_SECTION_QUALITY
-		DRI_CONF_TEXTURE_DEPTH(DRI_CONF_TEXTURE_DEPTH_FB)
-		DRI_CONF_DEF_MAX_ANISOTROPY(1.0, "1.0,2.0,4.0,8.0,16.0")
-		DRI_CONF_NO_NEG_LOD_BIAS(false)
-		DRI_CONF_FORCE_S3TC_ENABLE(false)
-		DRI_CONF_COLOR_REDUCTION(DRI_CONF_COLOR_REDUCTION_DITHER)
-		DRI_CONF_ROUND_MODE(DRI_CONF_ROUND_TRUNC)
-		DRI_CONF_DITHER_MODE(DRI_CONF_DITHER_XERRORDIFF)
-	DRI_CONF_SECTION_END
-	DRI_CONF_SECTION_DEBUG
-		DRI_CONF_NO_RAST(false)
-	DRI_CONF_SECTION_END
-	DRI_CONF_SECTION_SOFTWARE
-		DRI_CONF_ARB_VERTEX_PROGRAM(true)
-		DRI_CONF_NV_VERTEX_PROGRAM(false)
-	DRI_CONF_SECTION_END
-DRI_CONF_END;
-static const GLuint __driR200NConfigOptions = 14;
-
-/* TODO: integrate these into xmlpool.h! */
-#define DRI_CONF_MAX_TEXTURE_IMAGE_UNITS(def,min,max) \
-DRI_CONF_OPT_BEGIN_V(texture_image_units,int,def, # min ":" # max ) \
-        DRI_CONF_DESC(en,"Number of texture image units") \
-        DRI_CONF_DESC(de,"Anzahl der Textureinheiten") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_MAX_TEXTURE_COORD_UNITS(def,min,max) \
-DRI_CONF_OPT_BEGIN_V(texture_coord_units,int,def, # min ":" # max ) \
-        DRI_CONF_DESC(en,"Number of texture coordinate units") \
-        DRI_CONF_DESC(de,"Anzahl der Texturkoordinateneinheiten") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_COMMAND_BUFFER_SIZE(def,min,max) \
-DRI_CONF_OPT_BEGIN_V(command_buffer_size,int,def, # min ":" # max ) \
-        DRI_CONF_DESC(en,"Size of command buffer (in KB)") \
-        DRI_CONF_DESC(de,"Grösse des Befehlspuffers (in KB)") \
-DRI_CONF_OPT_END
-
-
-const char __driR300ConfigOptions[] =
-DRI_CONF_BEGIN
-	DRI_CONF_SECTION_PERFORMANCE
-		DRI_CONF_TCL_MODE(DRI_CONF_TCL_CODEGEN)
-		DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS)
-		DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_0)
-		DRI_CONF_MAX_TEXTURE_IMAGE_UNITS(16, 2, 16)
-		DRI_CONF_MAX_TEXTURE_COORD_UNITS(8, 2, 8)
-		DRI_CONF_COMMAND_BUFFER_SIZE(8, 8, 32)
-	DRI_CONF_SECTION_END
-	DRI_CONF_SECTION_QUALITY
-		DRI_CONF_TEXTURE_DEPTH(DRI_CONF_TEXTURE_DEPTH_FB)
-		DRI_CONF_DEF_MAX_ANISOTROPY(1.0, "1.0,2.0,4.0,8.0,16.0")
-		DRI_CONF_NO_NEG_LOD_BIAS(false)
-                DRI_CONF_FORCE_S3TC_ENABLE(false)
-		DRI_CONF_COLOR_REDUCTION(DRI_CONF_COLOR_REDUCTION_DITHER)
-		DRI_CONF_ROUND_MODE(DRI_CONF_ROUND_TRUNC)
-		DRI_CONF_DITHER_MODE(DRI_CONF_DITHER_XERRORDIFF)
-	DRI_CONF_SECTION_END
-	DRI_CONF_SECTION_DEBUG
-		DRI_CONF_NO_RAST(false)
-	DRI_CONF_SECTION_END
-DRI_CONF_END;
-static const GLuint __driR300NConfigOptions = 14;
-
-extern const struct dri_extension card_extensions[];
-
-#ifndef RADEON_DEBUG
-int RADEON_DEBUG = 0;
-#endif
-
-static const struct dri_debug_control debug_control[] = {
-	{"fall", DEBUG_FALLBACKS},
-	{"tex", DEBUG_TEXTURE},
-	{"ioctl", DEBUG_IOCTL},
-	{"prim", DEBUG_PRIMS},
-	{"vert", DEBUG_VERTS},
-	{"state", DEBUG_STATE},
-	{"code", DEBUG_CODEGEN},
-	{"vfmt", DEBUG_VFMT},
-	{"vtxf", DEBUG_VFMT},
-	{"verb", DEBUG_VERBOSE},
-	{"dri", DEBUG_DRI},
-	{"dma", DEBUG_DMA},
-	{"san", DEBUG_SANITY},
-	{"sync", DEBUG_SYNC},
-	{"pix", DEBUG_PIXEL},
-	{"mem", DEBUG_MEMORY},
-	{"allmsg", ~DEBUG_SYNC}, /* avoid the term "sync" because the parser uses strstr */
-	{NULL, 0}
-};
-
-#if 1
-/* Including xf86PciInfo.h introduces a bunch of errors...
- */
-#define PCI_CHIP_R200_QD	0x5144	/* why do they have r200 names? */
-#define PCI_CHIP_R200_QE	0x5145	/* Those are all standard radeons */
-#define PCI_CHIP_R200_QF	0x5146
-#define PCI_CHIP_R200_QG	0x5147
-#define PCI_CHIP_R200_QY	0x5159
-#define PCI_CHIP_R200_QZ	0x515A
-#define PCI_CHIP_R200_LW	0x4C57
-#define PCI_CHIP_R200_LY	0x4C59
-#define PCI_CHIP_R200_LZ	0x4C5A
-#define PCI_CHIP_RV200_QW	0x5157	/* Radeon 7500 - not an R200 at all */
-#define PCI_CHIP_RV200_QX       0x5158
-#define PCI_CHIP_RS100_4136     0x4136	/* IGP RS100, RS200, RS250 are not R200 */
-#define PCI_CHIP_RS200_4137     0x4137
-#define PCI_CHIP_RS250_4237     0x4237
-#define PCI_CHIP_RS100_4336     0x4336
-#define PCI_CHIP_RS200_4337     0x4337
-#define PCI_CHIP_RS250_4437     0x4437
-#define PCI_CHIP_RS300_5834     0x5834	/* All RS300's are R200 */
-#define PCI_CHIP_RS300_5835     0x5835
-#define PCI_CHIP_RS300_5836     0x5836
-#define PCI_CHIP_RS300_5837     0x5837
-#define PCI_CHIP_R200_BB        0x4242	/* r200 (non-derived) start */
-#define PCI_CHIP_R200_BC        0x4243
-#define PCI_CHIP_R200_QH        0x5148
-#define PCI_CHIP_R200_QI        0x5149
-#define PCI_CHIP_R200_QJ        0x514A
-#define PCI_CHIP_R200_QK        0x514B
-#define PCI_CHIP_R200_QL        0x514C
-#define PCI_CHIP_R200_QM        0x514D
-#define PCI_CHIP_R200_QN        0x514E
-#define PCI_CHIP_R200_QO        0x514F	/* r200 (non-derived) end */
-/* are the R200 Qh (0x5168) and following needed too? They are not in xf86PciInfo.h
-   but in the pci database. Maybe just secondary ports or something ? */
-
-#define PCI_CHIP_R300_AD		0x4144
-#define PCI_CHIP_R300_AE		0x4145
-#define PCI_CHIP_R300_AF		0x4146
-#define PCI_CHIP_R300_AG		0x4147
-#define PCI_CHIP_RV350_AP               0x4150
-#define PCI_CHIP_RV350_AQ               0x4151
-#define PCI_CHIP_RV350_AR               0x4152
-#define PCI_CHIP_RV350_AS               0x4153
-#define PCI_CHIP_RV350_NJ		0x4E4A
-#define PCI_CHIP_RV350_NP               0x4E50
-#define PCI_CHIP_RV350_NQ               0x4E51			/* Saphire 9600 256MB card */
-#define PCI_CHIP_RV350_NT               0x4E54
-#define PCI_CHIP_RV350_NQ_2             0x4E71			/* Saphire 9600 256MB card - Second Head */
-#define PCI_CHIP_R300_ND		0x4E44
-#define PCI_CHIP_R300_NE		0x4E45
-#define PCI_CHIP_R300_NF		0x4E46
-#define PCI_CHIP_R300_NG		0x4E47
-#define PCI_CHIP_R350_NH                0x4E48
-#define PCI_CHIP_R420_JI		0x4A49
-#define PCI_CHIP_R420_JK                0x4a4b
-#define PCI_CHIP_RV370_5460		0x5460
-#endif
-
-
-static radeonScreenPtr __radeonScreen;
-
-static int getSwapInfo(__DRIdrawablePrivate * dPriv, __DRIswapInfo * sInfo);
-
-static __GLcontextModes *radeonFillInModes(unsigned pixel_bits,
-					 unsigned depth_bits,
-					 unsigned stencil_bits,
-					 GLboolean have_back_buffer)
-{
-	__GLcontextModes *modes;
-	__GLcontextModes *m;
-	unsigned num_modes;
-	unsigned depth_buffer_factor;
-	unsigned back_buffer_factor;
-	GLenum fb_format;
-	GLenum fb_type;
-
-	/* Right now GLX_SWAP_COPY_OML isn't supported, but it would be easy
-	 * enough to add support.  Basically, if a context is created with an
-	 * fbconfig where the swap method is GLX_SWAP_COPY_OML, pageflipping
-	 * will never be used.
-	 */
-	static const GLenum back_buffer_modes[] = {
-		GLX_NONE, GLX_SWAP_UNDEFINED_OML	/*, GLX_SWAP_COPY_OML */
-	};
-
-	uint8_t depth_bits_array[2];
-	uint8_t stencil_bits_array[2];
-
-	depth_bits_array[0] = depth_bits;
-	depth_bits_array[1] = depth_bits;
-
-	/* Just like with the accumulation buffer, always provide some modes
-	 * with a stencil buffer.  It will be a sw fallback, but some apps won't
-	 * care about that.
-	 */
-	stencil_bits_array[0] = 0;
-	stencil_bits_array[1] = (stencil_bits == 0) ? 8 : stencil_bits;
-
-	depth_buffer_factor = ((depth_bits != 0)
-			       || (stencil_bits != 0)) ? 2 : 1;
-	back_buffer_factor = (have_back_buffer) ? 2 : 1;
-
-	num_modes = depth_buffer_factor * back_buffer_factor * 4;
-
-	if (pixel_bits == 16) {
-		fb_format = GL_RGB;
-		fb_type = GL_UNSIGNED_SHORT_5_6_5;
-	} else {
-		fb_format = GL_BGRA;
-		fb_type = GL_UNSIGNED_INT_8_8_8_8_REV;
-	}
-
-	modes = (*dri_interface->createContextModes) (num_modes, sizeof(__GLcontextModes));
-	m = modes;
-	if (!driFillInModes(&m, fb_format, fb_type,
-			    depth_bits_array, stencil_bits_array,
-			    depth_buffer_factor, back_buffer_modes,
-			    back_buffer_factor, GLX_TRUE_COLOR)) {
-		fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__,
-			__LINE__);
-		return NULL;
-	}
-
-	if (!driFillInModes(&m, fb_format, fb_type,
-			    depth_bits_array, stencil_bits_array,
-			    depth_buffer_factor, back_buffer_modes,
-			    back_buffer_factor, GLX_DIRECT_COLOR)) {
-		fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__,
-			__LINE__);
-		return NULL;
-	}
-
-	/* Mark the visual as slow if there are "fake" stencil bits.
-	 */
-	for (m = modes; m != NULL; m = m->next) {
-		if ((m->stencilBits != 0) && (m->stencilBits != stencil_bits)) {
-			m->visualRating = GLX_SLOW_CONFIG;
-		}
-	}
-
-	return modes;
-}
-
-
-/* Create the device specific screen private data struct.
- */
-static radeonScreenPtr radeonCreateScreen(__DRIscreenPrivate * sPriv)
-{
-	radeonScreenPtr screen;
-	RADEONDRIPtr dri_priv = (RADEONDRIPtr) sPriv->pDevPriv;
-	unsigned char *RADEONMMIO;
-	PFNGLXSCRENABLEEXTENSIONPROC glx_enable_extension =
-	  (PFNGLXSCRENABLEEXTENSIONPROC)
-	      (*dri_interface->getProcAddress("glxEnableExtension"));
-	void *const psc = sPriv->psc->screenConfigs;
-
-	if (sPriv->devPrivSize != sizeof(RADEONDRIRec)) {
-      		fprintf(stderr,"\nERROR!  sizeof(RADEONDRIRec) does not match passed size from device driver\n");
-      		return GL_FALSE;
-   	}
-
-	/* Allocate the private area */
-	screen = (radeonScreenPtr) CALLOC(sizeof(*screen));
-	if (!screen) {
-		__driUtilMessage
-		    ("%s: Could not allocate memory for screen structure",
-		     __FUNCTION__);
-		return NULL;
-	}
-
-#if DO_DEBUG
-	RADEON_DEBUG = driParseDebugString(getenv("RADEON_DEBUG"), debug_control);
-#endif
-
-	/* Get family and potential quirks from the PCI device ID.
-	 */
-	switch (dri_priv->deviceID) {
-	case PCI_CHIP_R200_QD:
-	case PCI_CHIP_R200_QE:
-	case PCI_CHIP_R200_QF:
-	case PCI_CHIP_R200_QG:
-	case PCI_CHIP_R200_QY:
-	case PCI_CHIP_R200_QZ:
-	case PCI_CHIP_RV200_QW:
-	case PCI_CHIP_RV200_QX:
-	case PCI_CHIP_R200_LW:
-	case PCI_CHIP_R200_LY:
-	case PCI_CHIP_R200_LZ:
-	case PCI_CHIP_RS100_4136:
-	case PCI_CHIP_RS200_4137:
-	case PCI_CHIP_RS250_4237:
-	case PCI_CHIP_RS100_4336:
-	case PCI_CHIP_RS200_4337:
-	case PCI_CHIP_RS250_4437:
-		__driUtilMessage("radeonCreateScreen(): Device isn't an r200!\n");
-		FREE(screen);
-		return NULL;
-
-	case PCI_CHIP_RS300_5834:
-	case PCI_CHIP_RS300_5835:
-	case PCI_CHIP_RS300_5836:
-	case PCI_CHIP_RS300_5837:
-		screen->chipset = RADEON_CHIP_UNREAL_R200;
-		break;
-
-	case PCI_CHIP_R200_BB:
-	case PCI_CHIP_R200_BC:
-	case PCI_CHIP_R200_QH:
-	case PCI_CHIP_R200_QI:
-	case PCI_CHIP_R200_QJ:
-	case PCI_CHIP_R200_QK:
-	case PCI_CHIP_R200_QL:
-	case PCI_CHIP_R200_QM:
-	case PCI_CHIP_R200_QN:
-	case PCI_CHIP_R200_QO:
-		screen->chipset = RADEON_CHIP_REAL_R200 | RADEON_CHIPSET_TCL;
-		break;
-
-	/* TODO: Check all those chips for the exact flags required.
-	 */
-	case PCI_CHIP_R300_AD:
-	case PCI_CHIP_R300_AE:
-	case PCI_CHIP_R300_AF:
-	case PCI_CHIP_R300_AG:
-	case PCI_CHIP_RV350_AP:
-        case PCI_CHIP_RV350_AQ:
-	case PCI_CHIP_RV350_AR:
-	case PCI_CHIP_RV350_AS:
-	case PCI_CHIP_RV350_NJ:
-	case PCI_CHIP_RV350_NP:
-	case PCI_CHIP_RV350_NT:
-	case PCI_CHIP_RV350_NQ:
-/*	case PCI_CHIP_RV350_NQ:  -- Should we have the second head in here too? */
-	case PCI_CHIP_RV370_5460:
-		screen->chipset = RADEON_CHIP_RV350;
-		break;
-
-	case PCI_CHIP_R300_ND: /* confirmed -- nh */
-	case PCI_CHIP_R300_NE:
-	case PCI_CHIP_R300_NF:
-	case PCI_CHIP_R300_NG:
-	case PCI_CHIP_R350_NH:
-		screen->chipset = RADEON_CHIP_R300;
-		break;
-
-	case PCI_CHIP_R420_JI:
-	case PCI_CHIP_R420_JK:
-		screen->chipset = RADEON_CHIP_R420;
-		break;
-
-	default:
-		fprintf(stderr,
-			"Unknown device ID %04X, please report. Assuming plain R300.\n",
-			dri_priv->deviceID);
-		screen->chipset = RADEON_CHIP_R300;
-	}
-
-	/* Parse configuration */
-	if (GET_CHIP(screen) >= RADEON_CHIP_R300) {
-		driParseOptionInfo(&screen->optionCache,
-				__driR300ConfigOptions, __driR300NConfigOptions);
-	} else {
-		driParseOptionInfo(&screen->optionCache,
-				__driR200ConfigOptions, __driR200NConfigOptions);
-	}
-
-	/* This is first since which regions we map depends on whether or
-	 * not we are using a PCI card.
-	 */
-	screen->IsPCI = dri_priv->IsPCI;
-
-	{
-		int ret;
-		drm_radeon_getparam_t gp;
-
-		gp.param = RADEON_PARAM_GART_BUFFER_OFFSET;
-		gp.value = &screen->gart_buffer_offset;
-
-		ret = drmCommandWriteRead(sPriv->fd, DRM_RADEON_GETPARAM,
-					  &gp, sizeof(gp));
-		if (ret) {
-			FREE(screen);
-			fprintf(stderr,
-				"drmRadeonGetParam (RADEON_PARAM_GART_BUFFER_OFFSET): %d\n",
-				ret);
-			return NULL;
-		}
-
-		if (sPriv->drmMinor >= 6) {
-			gp.param = RADEON_PARAM_GART_BASE;
-			gp.value = &screen->gart_base;
-
-			ret =
-			    drmCommandWriteRead(sPriv->fd, DRM_RADEON_GETPARAM,
-						&gp, sizeof(gp));
-			if (ret) {
-				FREE(screen);
-				fprintf(stderr,
-					"drmR200GetParam (RADEON_PARAM_GART_BASE): %d\n",
-					ret);
-				return NULL;
-			}
-
-			gp.param = RADEON_PARAM_IRQ_NR;
-			gp.value = &screen->irq;
-
-			ret =
-			    drmCommandWriteRead(sPriv->fd, DRM_RADEON_GETPARAM,
-						&gp, sizeof(gp));
-			if (ret) {
-				FREE(screen);
-				fprintf(stderr,
-					"drmRadeonGetParam (RADEON_PARAM_IRQ_NR): %d\n",
-					ret);
-				return NULL;
-			}
-
-			/* Check if kernel module is new enough to support cube maps */
-			screen->drmSupportsCubeMaps = (sPriv->drmMinor >= 7);
-			/* Check if kernel module is new enough to support blend color and
-			   separate blend functions/equations */
-			screen->drmSupportsBlendColor = (sPriv->drmMinor >= 11);
-
-		}
-	}
-
-	screen->mmio.handle = dri_priv->registerHandle;
-	screen->mmio.size = dri_priv->registerSize;
-	if (drmMap(sPriv->fd,
-		   screen->mmio.handle, screen->mmio.size, &screen->mmio.map)) {
-		FREE(screen);
-		__driUtilMessage("%s: drmMap failed\n", __FUNCTION__);
-		return NULL;
-	}
-
-	RADEONMMIO = screen->mmio.map;
-
-	screen->status.handle = dri_priv->statusHandle;
-	screen->status.size = dri_priv->statusSize;
-	if (drmMap(sPriv->fd,
-		   screen->status.handle,
-		   screen->status.size, &screen->status.map)) {
-		drmUnmap(screen->mmio.map, screen->mmio.size);
-		FREE(screen);
-		__driUtilMessage("%s: drmMap (2) failed\n", __FUNCTION__);
-		return NULL;
-	}
-	screen->scratch = (__volatile__ uint32_t *)
-	    ((GLubyte *) screen->status.map + RADEON_SCRATCH_REG_OFFSET);
-
-	screen->buffers = drmMapBufs(sPriv->fd);
-	if (!screen->buffers) {
-		drmUnmap(screen->status.map, screen->status.size);
-		drmUnmap(screen->mmio.map, screen->mmio.size);
-		FREE(screen);
-		__driUtilMessage("%s: drmMapBufs failed\n", __FUNCTION__);
-		return NULL;
-	}
-
-	if (dri_priv->gartTexHandle && dri_priv->gartTexMapSize) {
-
-		screen->gartTextures.handle = dri_priv->gartTexHandle;
-		screen->gartTextures.size = dri_priv->gartTexMapSize;
-		if (drmMap(sPriv->fd,
-			   screen->gartTextures.handle,
-			   screen->gartTextures.size,
-			   (drmAddressPtr) & screen->gartTextures.map)) {
-			drmUnmapBufs(screen->buffers);
-			drmUnmap(screen->status.map, screen->status.size);
-			drmUnmap(screen->mmio.map, screen->mmio.size);
-			FREE(screen);
-			__driUtilMessage
-			    ("%s: drmMAP failed for GART texture area\n",
-			     __FUNCTION__);
-			return NULL;
-		}
-
-		screen->gart_texture_offset =
-		    dri_priv->gartTexOffset +
-		    (screen->IsPCI ? INREG(RADEON_AIC_LO_ADDR)
-		     : ((INREG(RADEON_MC_AGP_LOCATION) & 0x0ffffU) << 16));
-	}
-
-	screen->cpp = dri_priv->bpp / 8;
-	screen->AGPMode = dri_priv->AGPMode;
-
-	screen->fbLocation = (INREG(RADEON_MC_FB_LOCATION) & 0xffff) << 16;
-
-	if (sPriv->drmMinor >= 10) {
-		drm_radeon_setparam_t sp;
-
-		sp.param = RADEON_SETPARAM_FB_LOCATION;
-		sp.value = screen->fbLocation;
-
-		drmCommandWrite(sPriv->fd, DRM_RADEON_SETPARAM,
-				&sp, sizeof(sp));
-	}
-
-	screen->frontOffset = dri_priv->frontOffset;
-	screen->frontPitch = dri_priv->frontPitch;
-	screen->backOffset = dri_priv->backOffset;
-	screen->backPitch = dri_priv->backPitch;
-	screen->depthOffset = dri_priv->depthOffset;
-	screen->depthPitch = dri_priv->depthPitch;
-	
-	/* Check if ddx has set up a surface reg to cover depth buffer */
-	screen->depthHasSurface = (sPriv->ddxMajor > 4);
-
-	screen->texOffset[RADEON_LOCAL_TEX_HEAP] = dri_priv->textureOffset
-	    + screen->fbLocation;
-	screen->texSize[RADEON_LOCAL_TEX_HEAP] = dri_priv->textureSize;
-	screen->logTexGranularity[RADEON_LOCAL_TEX_HEAP] =
-	    dri_priv->log2TexGran;
-
-	if (!screen->gartTextures.map) {
-		screen->numTexHeaps = RADEON_NR_TEX_HEAPS - 1;
-		screen->texOffset[RADEON_GART_TEX_HEAP] = 0;
-		screen->texSize[RADEON_GART_TEX_HEAP] = 0;
-		screen->logTexGranularity[RADEON_GART_TEX_HEAP] = 0;
-	} else {
-		screen->numTexHeaps = RADEON_NR_TEX_HEAPS;
-		screen->texOffset[RADEON_GART_TEX_HEAP] =
-		    screen->gart_texture_offset;
-		screen->texSize[RADEON_GART_TEX_HEAP] =
-		    dri_priv->gartTexMapSize;
-		screen->logTexGranularity[RADEON_GART_TEX_HEAP] =
-		    dri_priv->log2GARTTexGran;
-	}
-
-	screen->driScreen = sPriv;
-	screen->sarea_priv_offset = dri_priv->sarea_priv_offset;
-
-	if (glx_enable_extension != NULL) {
-		if (screen->irq != 0) {
-			(*glx_enable_extension) (psc, "GLX_SGI_swap_control");
-			(*glx_enable_extension) (psc, "GLX_SGI_video_sync");
-			(*glx_enable_extension) (psc, "GLX_MESA_swap_control");
-		}
-
-		(*glx_enable_extension) (psc, "GLX_MESA_swap_frame_usage");
-	}
-
-#if R200_MERGED
-	sPriv->psc->allocateMemory = (void *)r200AllocateMemoryMESA;
-	sPriv->psc->freeMemory = (void *)r200FreeMemoryMESA;
-	sPriv->psc->memoryOffset = (void *)r200GetMemoryOffsetMESA;
-
-	if (glx_enable_extension != NULL) {
-		(*glx_enable_extension) (psc, "GLX_MESA_allocate_memory");
-	}
-#endif
-
-	return screen;
-}
-
-/* Destroy the device specific screen private data struct.
- */
-static void radeonDestroyScreen(__DRIscreenPrivate * sPriv)
-{
-	radeonScreenPtr screen = (radeonScreenPtr) sPriv->private;
-
-	if (!screen)
-		return;
-
-	if (screen->gartTextures.map) {
-		drmUnmap(screen->gartTextures.map, screen->gartTextures.size);
-	}
-	drmUnmapBufs(screen->buffers);
-	drmUnmap(screen->status.map, screen->status.size);
-	drmUnmap(screen->mmio.map, screen->mmio.size);
-
-	/* free all option information */
-	driDestroyOptionInfo(&screen->optionCache);
-
-	FREE(screen);
-	sPriv->private = NULL;
-}
-
-/* Initialize the driver specific screen private data.
- */
-static GLboolean radeonInitDriver(__DRIscreenPrivate * sPriv)
-{
-	__radeonScreen = radeonCreateScreen(sPriv);
-
-	sPriv->private = (void *)__radeonScreen;
-
-	return sPriv->private ? GL_TRUE : GL_FALSE;
-}
-
-/**
- * Create and initialize the Mesa and driver specific pixmap buffer
- * data.
- *
- * \todo This function (and its interface) will need to be updated to support
- * pbuffers.
- */
-static GLboolean
-radeonCreateBuffer(__DRIscreenPrivate * driScrnPriv,
-		   __DRIdrawablePrivate * driDrawPriv,
-		   const __GLcontextModes * mesaVis, GLboolean isPixmap)
-{
-	radeonScreenPtr screen = (radeonScreenPtr)driScrnPriv->private;
-
-	if (isPixmap) {
-		return GL_FALSE;	/* not implemented */
-	} else {
-		const GLboolean swDepth = GL_FALSE;
-		const GLboolean swAlpha = GL_FALSE;
-		const GLboolean swAccum = mesaVis->accumRedBits > 0;
-		const GLboolean swStencil = mesaVis->stencilBits > 0 &&
-		    mesaVis->depthBits != 24;
-
-		struct gl_framebuffer *fb = _mesa_create_framebuffer(mesaVis);
-		{
-			driRenderbuffer *frontRb
-				= driNewRenderbuffer(GL_RGBA,
-						     driScrnPriv->pFB + screen->frontOffset,
-						     screen->cpp,
-						     screen->frontOffset,
-						     screen->frontPitch,
-						     driDrawPriv);
-			radeonSetSpanFunctions(frontRb, mesaVis);
-			_mesa_add_renderbuffer(fb, BUFFER_FRONT_LEFT, &frontRb->Base);
-		}
-		if (mesaVis->doubleBufferMode) {
-			driRenderbuffer *backRb
-				= driNewRenderbuffer(GL_RGBA,            
-						     driScrnPriv->pFB + screen->backOffset,
-						     screen->cpp,
-						     screen->backOffset,
-						     screen->backPitch,
-						     driDrawPriv);
-			radeonSetSpanFunctions(backRb, mesaVis);
-			_mesa_add_renderbuffer(fb, BUFFER_BACK_LEFT, &backRb->Base);
-		}
-		if (mesaVis->depthBits == 16) {
-			driRenderbuffer *depthRb
-				= driNewRenderbuffer(GL_DEPTH_COMPONENT16,
-						     driScrnPriv->pFB + screen->depthOffset,
-						     screen->cpp,
-						     screen->depthOffset,
-						     screen->depthPitch,
-						     driDrawPriv);
-			radeonSetSpanFunctions(depthRb, mesaVis);
-			_mesa_add_renderbuffer(fb, BUFFER_DEPTH, &depthRb->Base);
-			depthRb->depthHasSurface = screen->depthHasSurface;
-		}
-		else if (mesaVis->depthBits == 24) {
-			driRenderbuffer *depthRb
-				= driNewRenderbuffer(GL_DEPTH_COMPONENT24,
-						     driScrnPriv->pFB + screen->depthOffset,
-						     screen->cpp,
-						     screen->depthOffset,
-						     screen->depthPitch,
-						     driDrawPriv);
-			radeonSetSpanFunctions(depthRb, mesaVis);
-			_mesa_add_renderbuffer(fb, BUFFER_DEPTH, &depthRb->Base);
-			depthRb->depthHasSurface = screen->depthHasSurface;
-		}
-  	 
-		if (mesaVis->stencilBits > 0 && !swStencil) {
-			driRenderbuffer *stencilRb
-				= driNewRenderbuffer(GL_STENCIL_INDEX8_EXT,
-						     driScrnPriv->pFB + screen->depthOffset,
-						     screen->cpp,
-						     screen->depthOffset,
-						     screen->depthPitch,
-						     driDrawPriv);
-			radeonSetSpanFunctions(stencilRb, mesaVis);
-			_mesa_add_renderbuffer(fb, BUFFER_STENCIL, &stencilRb->Base);
-			stencilRb->depthHasSurface = screen->depthHasSurface;
-		}
-  	 
-		_mesa_add_soft_renderbuffers(fb,
-					GL_FALSE, /* color */
-					swDepth,
-					swStencil,
-					swAccum,
-					swAlpha,
-					GL_FALSE /* aux */);
-		driDrawPriv->driverPrivate = (void *) fb;	
-
-		return (driDrawPriv->driverPrivate != NULL);
-	}
-}
-
-static void radeonDestroyBuffer(__DRIdrawablePrivate * driDrawPriv)
-{
-	_mesa_destroy_framebuffer((GLframebuffer *) (driDrawPriv->
-						     driverPrivate));
-}
-
-
-/**
- * Choose the appropriate CreateContext function based on the chipset.
- */
-static GLboolean radeonCreateContext(const __GLcontextModes * glVisual,
-				     __DRIcontextPrivate * driContextPriv,
-				     void *sharedContextPriv)
-{
-	__DRIscreenPrivate *sPriv = driContextPriv->driScreenPriv;
-	radeonScreenPtr screen = (radeonScreenPtr) (sPriv->private);
-	int chip = GET_CHIP(screen);
-
-	if (chip >= RADEON_CHIP_R300)
-		return r300CreateContext(glVisual, driContextPriv, sharedContextPriv);
-#if R200_MERGED
-	else
-		return r200CreateContext(glVisual, driContextPriv, sharedContextPriv);
-#endif
-        return GL_FALSE;
-}
-
-
-/**
- * Choose the appropriate DestroyContext function based on the chipset.
- */
-static void radeonDestroyContext(__DRIcontextPrivate * driContextPriv)
-{
-	radeonContextPtr radeon = (radeonContextPtr) driContextPriv->driverPrivate;
-	int chip = GET_CHIP(radeon->radeonScreen);
-
-	if (chip >= RADEON_CHIP_R300)
-		return r300DestroyContext(driContextPriv);
-#if R200_MERGED
-	else
-		return r200DestroyContext(driContextPriv);
-#endif
-}
-
-
-static const struct __DriverAPIRec radeonAPI = {
-	.InitDriver = radeonInitDriver,
-	.DestroyScreen = radeonDestroyScreen,
-	.CreateContext = radeonCreateContext,
-	.DestroyContext = radeonDestroyContext,
-	.CreateBuffer = radeonCreateBuffer,
-	.DestroyBuffer = radeonDestroyBuffer,
-	.SwapBuffers = radeonSwapBuffers,
-	.MakeCurrent = radeonMakeCurrent,
-	.UnbindContext = radeonUnbindContext,
-	.GetSwapInfo = getSwapInfo,
-	.GetMSC = driGetMSC32,
-	.WaitForMSC = driWaitForMSC32,
-	.WaitForSBC = NULL,
-	.SwapBuffersMSC = NULL
-};
-
-
-/**
- * This is the bootstrap function for the driver.  libGL supplies all of the
- * requisite information about the system, and the driver initializes itself.
- * This routine also fills in the linked list pointed to by \c driver_modes
- * with the \c __GLcontextModes that the driver can support for windows or
- * pbuffers.
- *
- * \return A pointer to a \c __DRIscreenPrivate on success, or \c NULL on
- *         failure.
- */
-void *__driCreateNewScreen_20050727(__DRInativeDisplay * dpy, int scrn,
-			   __DRIscreen * psc, const __GLcontextModes * modes,
-			   const __DRIversion * ddx_version,
-			   const __DRIversion * dri_version,
-			   const __DRIversion * drm_version,
-			   const __DRIframebuffer * frame_buffer,
-			   drmAddress pSAREA, int fd, int internal_api_version,
-			   const __DRIinterfaceMethods * interface,
-			   __GLcontextModes ** driver_modes)
-{
-	__DRIscreenPrivate *psp;
-	static const __DRIutilversion2 ddx_expected = { 4, 5, 0, 0 };
-	static const __DRIversion dri_expected = { 4, 0, 0 };
-	static const __DRIversion drm_expected = { 1, 17, 0 };
-
-	dri_interface = interface;
-
-	if (!driCheckDriDdxDrmVersions3("R300",
-					dri_version, &dri_expected,
-					ddx_version, &ddx_expected,
-					drm_version, &drm_expected)) {
-		return NULL;
-	}
-
-	psp = __driUtilCreateNewScreen(dpy, scrn, psc, NULL,
-				       ddx_version, dri_version, drm_version,
-				       frame_buffer, pSAREA, fd,
-				       internal_api_version, &radeonAPI);
-	if (psp != NULL) {
-		RADEONDRIPtr dri_priv = (RADEONDRIPtr) psp->pDevPriv;
-		*driver_modes = radeonFillInModes(dri_priv->bpp,
-						  (dri_priv->bpp ==
-						   16) ? 16 : 24,
-						  (dri_priv->bpp ==
-						   16) ? 0 : 8,
-						  (dri_priv->backOffset !=
-						   dri_priv->depthOffset));
-		/* Calling driInitExtensions here, with a NULL context pointer, does not actually
-		 * enable the extensions.  It just makes sure that all the dispatch offsets for all
-		 * the extensions that *might* be enables are known.  This is needed because the
-		 * dispatch offsets need to be known when _mesa_context_create is called, but we can't
-		 * enable the extensions until we have a context pointer.
-		 *
-		 * Hello chicken.  Hello egg.  How are you two today?
-		 */
-		driInitExtensions( NULL, card_extensions, GL_FALSE );
-	}
-
-	return (void *)psp;
-}
-
-
-/**
- * Get information about previous buffer swaps.
- */
-static int getSwapInfo(__DRIdrawablePrivate * dPriv, __DRIswapInfo * sInfo)
-{
-	radeonContextPtr radeon;
-
-	if ((dPriv == NULL) || (dPriv->driContextPriv == NULL)
-	    || (dPriv->driContextPriv->driverPrivate == NULL)
-	    || (sInfo == NULL)) {
-		return -1;
-	}
-
-	radeon = (radeonContextPtr) dPriv->driContextPriv->driverPrivate;
-	sInfo->swap_count = radeon->swap_count;
-	sInfo->swap_ust = radeon->swap_ust;
-	sInfo->swap_missed_count = radeon->swap_missed_count;
-
-	sInfo->swap_missed_usage = (sInfo->swap_missed_count != 0)
-	    ? driCalculateSwapUsage(dPriv, 0, radeon->swap_missed_ust)
-	    : 0.0;
-
-	return 0;
-}
diff --git a/src/mesa/drivers/dri/r300/radeon_screen.h b/src/mesa/drivers/dri/r300/radeon_screen.h
deleted file mode 100644
index 22dc40158b0..00000000000
--- a/src/mesa/drivers/dri/r300/radeon_screen.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
-
-The Weather Channel (TM) funded Tungsten Graphics to develop the
-initial release of the Radeon 8500 driver under the XFree86 license.
-This notice must be preserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/*
- * Authors:
- *   Keith Whitwell <[email protected]>
- */
-
-#ifndef __RADEON_SCREEN_H__
-#define __RADEON_SCREEN_H__
-
-#ifdef GLX_DIRECT_RENDERING
-
-#include "xf86drm.h"
-#include "drm.h"
-#include "radeon_drm.h"
-#include "dri_util.h"
-#include "xmlconfig.h"
-
-typedef struct {
-	drm_handle_t handle;	/* Handle to the DRM region */
-	drmSize size;		/* Size of the DRM region */
-	drmAddress map;		/* Mapping of the DRM region */
-} radeonRegionRec, *radeonRegionPtr;
-
-/* chipset features */
-#define RADEON_CHIP_UNREAL_R200		0
-#define RADEON_CHIP_REAL_R200		1
-#define RADEON_CHIP_R300		2
-#define RADEON_CHIP_RV350		3
-#define RADEON_CHIP_R420		4
-#define RADEON_CHIP_MASK		0x0f
-
-#define RADEON_CHIPSET_TCL		(1 << 8)
-
-#define GET_CHIP(screen) ((screen)->chipset & RADEON_CHIP_MASK)
-#define IS_FAMILY_R200(radeon) (GET_CHIP((radeon)->radeonScreen) < RADEON_CHIP_R300)
-#define IS_FAMILY_R300(radeon) (GET_CHIP((radeon)->radeonScreen) >= RADEON_CHIP_R300)
-
-#define R200_NR_TEX_HEAPS 2
-
-typedef struct {
-	int chipset;
-	int cpp;
-	int IsPCI;		/* Current card is a PCI card */
-	int AGPMode;
-	unsigned int irq;	/* IRQ number (0 means none) */
-
-	unsigned int fbLocation;
-	unsigned int frontOffset;
-	unsigned int frontPitch;
-	unsigned int backOffset;
-	unsigned int backPitch;
-
-	unsigned int depthOffset;
-	unsigned int depthPitch;
-
-	/* Shared texture data */
-	int numTexHeaps;
-	int texOffset[R200_NR_TEX_HEAPS];
-	int texSize[R200_NR_TEX_HEAPS];
-	int logTexGranularity[R200_NR_TEX_HEAPS];
-
-	radeonRegionRec mmio;
-	radeonRegionRec status;
-	radeonRegionRec gartTextures;
-
-	drmBufMapPtr buffers;
-
-	__volatile__ uint32_t *scratch;
-
-	__DRIscreenPrivate *driScreen;
-	unsigned int sarea_priv_offset;
-	unsigned int gart_buffer_offset;	/* offset in card memory space */
-	unsigned int gart_texture_offset;	/* offset in card memory space */
-	unsigned int gart_base;
-
-	GLboolean drmSupportsCubeMaps;	/* need radeon kernel module >=1.7 */
-	GLboolean drmSupportsBlendColor;	/* need radeon kernel module >= 1.11 */
-        GLboolean depthHasSurface;
-
-	/* Configuration cache with default values for all contexts */
-	driOptionCache optionCache;
-} radeonScreenRec, *radeonScreenPtr;
-
-#endif
-#endif				/* __RADEON_SCREEN_H__ */
diff --git a/src/mesa/drivers/dri/r300/radeon_state.c b/src/mesa/drivers/dri/r300/radeon_state.c
index 7b64b34ed18..9171981e8c4 100644
--- a/src/mesa/drivers/dri/r300/radeon_state.c
+++ b/src/mesa/drivers/dri/r300/radeon_state.c
@@ -142,7 +142,7 @@ static void radeonScissor(GLcontext* ctx, GLint x, GLint y, GLsizei w, GLsizei h
 
 	if (ctx->Scissor.Enabled) {
 		/* We don't pipeline cliprect changes */
-		if (IS_FAMILY_R200(radeon))
+		if (IS_R200_CLASS(radeon->radeonScreen))
 			R200_FIREVERTICES((r200ContextPtr)radeon);
 		else
 			r300Flush(ctx);
@@ -198,7 +198,7 @@ void radeonEnable(GLcontext* ctx, GLenum cap, GLboolean state)
 	switch(cap) {
 	case GL_SCISSOR_TEST:
 		/* We don't pipeline cliprect & scissor changes */
-		if (IS_FAMILY_R200(radeon))
+		if (IS_R200_CLASS(radeon->radeonScreen))
 			R200_FIREVERTICES((r200ContextPtr)radeon);
 		else
 			r300Flush(ctx);