Merge branch 'r500test' of git://people.freedesktop.org/~airlied/mesa into r500test

Conflicts:

	src/mesa/drivers/dri/r300/r300_cmdbuf.c
	src/mesa/drivers/dri/r300/r300_ioctl.c
	src/mesa/drivers/dri/r300/r300_state.c
	src/mesa/drivers/dri/r300/r500_fragprog.c
	src/mesa/drivers/dri/r300/r500_fragprog.h
	src/mesa/drivers/dri/radeon/radeon_chipset.h
	src/mesa/drivers/dri/radeon/radeon_screen.c

diff --cc src/mesa/drivers/dri/r300/r500_fragprog.h
index 6678029f49bf81cbb4da73f2c3f01cbbc4572587,72fca778455b13400f493838edd032bfd9721397..404dbf3b7c53ab28d40a47aef3f5095e64f0d756
--- 1/src/mesa/drivers/dri/r300/r500_fragprog.h
--- 2/src/mesa/drivers/dri/r300/r500_fragprog.h
+++ b/src/mesa/drivers/dri/r300/r500_fragprog.h
@@@ -96,7 -96,9 +96,12 @@@ typedef struct r300_fragment_program_sw
  #define DRI_CONF_FP_OPTIMIZATION_SPEED   0
  #define DRI_CONF_FP_OPTIMIZATION_QUALITY 1
  
 -struct r300_fragment_program;
++struct r500_fragment_program;
++
 +extern void r500TranslateFragmentShader(r300ContextPtr r300,
 +                                      struct r500_fragment_program *fp);
  
+ extern void r300TranslateFragmentShader(r300ContextPtr r300,
+                                       struct r300_fragment_program *fp);
+ 
  #endif

diff --cc src/mesa/drivers/dri/radeon/radeon_chipset.h
index 5ea8cff1bfe2070f186f47d0e52158f20f8a999e,dc1b8a9c8eef436b260f8d42248be7517e64b19d..f9e459de91a001cb98489a18f398d15c27e58bff
--- 1/src/mesa/drivers/dri/radeon/radeon_chipset.h
--- 2/src/mesa/drivers/dri/radeon/radeon_chipset.h
+++ b/src/mesa/drivers/dri/radeon/radeon_chipset.h
@@@ -147,8 -147,7 +147,12 @@@
  #define PCI_CHIP_RV410_5E4D           0x5E4D
  #define PCI_CHIP_RV410_5E4F           0x5E4F
  
++<<<<<<< HEAD:src/mesa/drivers/dri/radeon/radeon_chipset.h
 +#define PCI_CHIP_RV530_71C4           0x71C4
 +#define PCI_CHIP_RV530_71D5           0x71D5
++=======
+ #define PCI_CHIP_RV530_71C4             0x71C4
++>>>>>>> eff6f1203222a776c5990b5d104b57a7f69b9aab:src/mesa/drivers/dri/radeon/radeon_chipset.h
  
  #define PCI_CHIP_RS350_7834           0x7834
  #define PCI_CHIP_RS350_7835           0x7835

diff --cc src/mesa/drivers/dri/radeon/radeon_screen.c
index 661ffd3a3d461d9d5dd58f3aaf4041ce6a8632b1,b0b8730b3992591bedf3b730f2e8cc5b4e65f32b..7d6b4a75777c566c26759033dfad81f859920fc7
--- 1/src/mesa/drivers/dri/radeon/radeon_screen.c
--- 2/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@@ -691,11 -691,6 +691,14 @@@ radeonCreateScreen( __DRIscreenPrivate 
        fprintf(stderr, "Warning, R520 detected, 3D HAHAHAHAHA!!.\n");
        break;
  
++<<<<<<< HEAD:src/mesa/drivers/dri/radeon/radeon_screen.c
 +   case PCI_CHIP_RV530_71D5:
 +      screen->chip_family = CHIP_FAMILY_R520;
 +      fprintf(stderr, "Warning, RV530 detected, all your base belong to us\n");
 +      break;
 +
++=======
++>>>>>>> eff6f1203222a776c5990b5d104b57a7f69b9aab:src/mesa/drivers/dri/radeon/radeon_screen.c
     default:
        fprintf(stderr, "unknown chip id 0x%x, can't guess.\n",
              dri_priv->deviceID);