xf86-video-ati: Branch 'kms-only'

[Dave Airlie]

 src/radeon.h |   69 -----------------------------------------------------------
 1 file changed, 69 deletions(-)

New commits:
commit 3e341fc81e8fe025bfbeef7448619ac9eefbfa5c
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Jun 15 19:52:14 2012 +0100

    radeon: drop some more unused macros.
    
    These are no longer used anywhere.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/radeon.h b/src/radeon.h
index e635be6..74a8dc8 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -588,75 +588,6 @@ do {									\
     radeon_cs_flush_indirect(pScrn); 				\
 } while (0)
 
-
-#define RADEON_WAIT_UNTIL_2D_IDLE()					\
-do {									\
-    if (info->ChipFamily < CHIP_FAMILY_R600) {                          \
-	BEGIN_RING(2);                                                  \
-	OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));                     \
-	OUT_RING((RADEON_WAIT_2D_IDLECLEAN |                            \
-		  RADEON_WAIT_HOST_IDLECLEAN));                         \
-	ADVANCE_RING();                                                 \
-    }                                                                   \
-} while (0)
-
-#define RADEON_WAIT_UNTIL_3D_IDLE()					\
-do {									\
-    if (info->ChipFamily < CHIP_FAMILY_R600) {				\
-	BEGIN_RING(2);							\
-	OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));                     \
-	OUT_RING((RADEON_WAIT_3D_IDLECLEAN |                            \
-		  RADEON_WAIT_HOST_IDLECLEAN));                         \
-	ADVANCE_RING();							\
-    }                                                                   \
-} while (0)
-
-#define RADEON_WAIT_UNTIL_IDLE()					\
-do {									\
-    if (RADEON_VERBOSE) {						\
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,				\
-		   "WAIT_UNTIL_IDLE() in %s\n", __FUNCTION__);		\
-    }									\
-    if (info->ChipFamily < CHIP_FAMILY_R600) {                          \
-	BEGIN_RING(2);							\
-	OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));                     \
-	OUT_RING((RADEON_WAIT_2D_IDLECLEAN |                            \
-                  RADEON_WAIT_3D_IDLECLEAN |                            \
-		  RADEON_WAIT_HOST_IDLECLEAN));                         \
-	ADVANCE_RING();							\
-    }                                                                   \
-} while (0)
-
-#define RADEON_PURGE_CACHE()						\
-do {									\
-    if (info->ChipFamily < CHIP_FAMILY_R600) {				\
-	BEGIN_RING(2);							\
-	if (info->ChipFamily <= CHIP_FAMILY_RV280) {			\
-	    OUT_RING(CP_PACKET0(RADEON_RB3D_DSTCACHE_CTLSTAT, 0));	\
-	    OUT_RING(RADEON_RB3D_DC_FLUSH_ALL);				\
-	} else {							\
-	    OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));	\
-	    OUT_RING(R300_RB3D_DC_FLUSH_ALL);				\
-	}								\
-	ADVANCE_RING();							\
-    }									\
-} while (0)
-
-#define RADEON_PURGE_ZCACHE()						\
-do {									\
-    if (info->ChipFamily < CHIP_FAMILY_R600) {                          \
-	BEGIN_RING(2);                                                  \
-	if (info->ChipFamily <= CHIP_FAMILY_RV280) {                    \
-	    OUT_RING(CP_PACKET0(RADEON_RB3D_ZCACHE_CTLSTAT, 0));        \
-	    OUT_RING(RADEON_RB3D_ZC_FLUSH_ALL);                         \
-	} else {                                                        \
-	    OUT_RING(CP_PACKET0(R300_RB3D_ZCACHE_CTLSTAT, 0));          \
-	    OUT_RING(R300_ZC_FLUSH_ALL);                                \
-	}                                                               \
-	ADVANCE_RING();                                                 \
-    }                                                                   \
-} while (0)
-
 #define CS_FULL(cs) ((cs)->cdw > 15 * 1024)
 
 #define RADEON_SWITCH_TO_2D()						\