radeon: move macros into radeon.h

Drop separate header file, there isn't many separate macros now.

Signed-off-by: Dave Airlie <airlied@redhat.com>

11 files changed, 27 insertions, 90 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index a32fe8de..ce0888b6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -88,7 +88,6 @@ EXTRA_DIST = \
 	radeon_exa_funcs.c \
 	radeon_exa_shared.h \
 	radeon.h \
-	radeon_macros.h \
 	radeon_probe.h \
 	radeon_reg.h \
 	radeon_version.h \
diff --git a/src/evergreen_exa.c b/src/evergreen_exa.c
index 247ba98c..6042aa48 100644
--- a/src/evergreen_exa.c
+++ b/src/evergreen_exa.c
@@ -33,7 +33,6 @@
 #include "exa.h"
 
 #include "radeon.h"
-#include "radeon_macros.h"
 #include "radeon_reg.h"
 #include "evergreen_shader.h"
 #include "evergreen_reg.h"
diff --git a/src/r600_exa.c b/src/r600_exa.c
index f0fe62a4..9a976d3e 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -33,7 +33,6 @@
 #include "exa.h"
 
 #include "radeon.h"
-#include "radeon_macros.h"
 #include "radeon_reg.h"
 #include "r600_shader.h"
 #include "r600_reg.h"
diff --git a/src/radeon.h b/src/radeon.h
index 5d7190e5..46263686 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -747,6 +747,33 @@ do {									\
         info->accel_state->engineMode = EXA_ENGINEMODE_3D;              \
 } while (0);
 
+				/* Memory mapped register access macros */
+
+#define BEGIN_ACCEL_RELOC(n, r) do {		\
+	int _nqw = (n) + (r);	\
+	BEGIN_RING(2*_nqw);			\
+    } while (0)
+
+#define EMIT_OFFSET(reg, value, pPix, rd, wd) do {		\
+    driver_priv = exaGetPixmapDriverPrivate(pPix);		\
+    OUT_RING_REG((reg), (value));				\
+    OUT_RING_RELOC(driver_priv->bo, (rd), (wd));			\
+    } while(0)
+
+#define EMIT_READ_OFFSET(reg, value, pPix) EMIT_OFFSET(reg, value, pPix, (RADEON_GEM_DOMAIN_VRAM | RADEON_GEM_DOMAIN_GTT), 0)
+#define EMIT_WRITE_OFFSET(reg, value, pPix) EMIT_OFFSET(reg, value, pPix, 0, RADEON_GEM_DOMAIN_VRAM)
+
+#define OUT_TEXTURE_REG(reg, offset, bo) do {   \
+    OUT_RING_REG((reg), (offset));                                   \
+    OUT_RING_RELOC((bo), RADEON_GEM_DOMAIN_VRAM | RADEON_GEM_DOMAIN_GTT, 0); \
+  } while(0)
+
+#define EMIT_COLORPITCH(reg, value, pPix) do {			\
+    driver_priv = exaGetPixmapDriverPrivate(pPix);			\
+    OUT_RING_REG((reg), value);					\
+    OUT_RING_RELOC(driver_priv->bo, 0, RADEON_GEM_DOMAIN_VRAM);		\
+} while(0)
+
 static __inline__ void RADEON_SYNC(RADEONInfoPtr info, ScrnInfoPtr pScrn)
 {
     if (pScrn->pScreen)
diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index 16e81f33..c8d52b95 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -80,7 +80,6 @@
 #include "radeon.h"
 #include "radeon_reg.h"
 #include "r600_reg.h"
-#include "radeon_macros.h"
 #include "radeon_probe.h"
 #include "radeon_version.h"
 
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 548aced7..28c1040e 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -71,7 +71,6 @@
 				/* Driver data structures */
 #include "radeon.h"
 #include "radeon_reg.h"
-#include "radeon_macros.h"
 #include "radeon_probe.h"
 #include "radeon_version.h"
 
diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index d99bf377..be125335 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -37,7 +37,6 @@
 #include "radeon_reg.h"
 #include "r600_reg.h"
 #include "radeon_drm.h"
-#include "radeon_macros.h"
 #include "radeon_probe.h"
 #include "radeon_version.h"
 #include "radeon_exa_shared.h"
diff --git a/src/radeon_exa_shared.c b/src/radeon_exa_shared.c
index a1a7cf96..1218efbc 100644
--- a/src/radeon_exa_shared.c
+++ b/src/radeon_exa_shared.c
@@ -35,7 +35,6 @@
 #endif
 
 #include "radeon.h"
-#include "radeon_macros.h"
 #include "radeon_probe.h"
 #include "radeon_version.h"
 #include "radeon_vbo.h"
diff --git a/src/radeon_macros.h b/src/radeon_macros.h
deleted file mode 100644
index ecc9110c..00000000
--- a/src/radeon_macros.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
- *                VA Linux Systems Inc., Fremont, California.
- *
- * All Rights Reserved.
- *
- * 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 on 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
- * NON-INFRINGEMENT.  IN NO EVENT SHALL ATI, VA LINUX SYSTEMS AND/OR
- * THEIR 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:
- *   Kevin E. Martin <martin@xfree86.org>
- *   Rickard E. Faith <faith@valinux.com>
- *   Alan Hourihane <alanh@fairlite.demon.co.uk>
- *
- * References:
- *
- * !!!! FIXME !!!!
- *   RAGE 128 VR/ RAGE 128 GL Register Reference Manual (Technical
- *   Reference Manual P/N RRG-G04100-C Rev. 0.04), ATI Technologies: April
- *   1999.
- *
- * !!!! FIXME !!!!
- *   RAGE 128 Software Development Manual (Technical Reference Manual P/N
- *   SDK-G04000 Rev. 0.01), ATI Technologies: June 1999.
- *
- */
-
-
-#ifndef _RADEON_MACROS_H_
-#define _RADEON_MACROS_H_
-
-#include "compiler.h"
-
-				/* Memory mapped register access macros */
-
-#define BEGIN_ACCEL_RELOC(n, r) do {		\
-	int _nqw = (n) + (r);	\
-	BEGIN_RING(2*_nqw);			\
-    } while (0)
-
-#define EMIT_OFFSET(reg, value, pPix, rd, wd) do {		\
-    driver_priv = exaGetPixmapDriverPrivate(pPix);		\
-    OUT_RING_REG((reg), (value));				\
-    OUT_RING_RELOC(driver_priv->bo, (rd), (wd));			\
-    } while(0)
-
-#define EMIT_READ_OFFSET(reg, value, pPix) EMIT_OFFSET(reg, value, pPix, (RADEON_GEM_DOMAIN_VRAM | RADEON_GEM_DOMAIN_GTT), 0)
-#define EMIT_WRITE_OFFSET(reg, value, pPix) EMIT_OFFSET(reg, value, pPix, 0, RADEON_GEM_DOMAIN_VRAM)
-
-#define OUT_TEXTURE_REG(reg, offset, bo) do {   \
-    OUT_RING_REG((reg), (offset));                                   \
-    OUT_RING_RELOC((bo), RADEON_GEM_DOMAIN_VRAM | RADEON_GEM_DOMAIN_GTT, 0); \
-  } while(0)
-
-#define EMIT_COLORPITCH(reg, value, pPix) do {			\
-    driver_priv = exaGetPixmapDriverPrivate(pPix);			\
-    OUT_RING_REG((reg), value);					\
-    OUT_RING_RELOC(driver_priv->bo, 0, RADEON_GEM_DOMAIN_VRAM);		\
-}while(0)
-
-#endif
diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
index 3bb04d06..1a0d51d2 100644
--- a/src/radeon_textured_video.c
+++ b/src/radeon_textured_video.c
@@ -36,7 +36,6 @@
 
 #include "radeon.h"
 #include "radeon_reg.h"
-#include "radeon_macros.h"
 #include "radeon_probe.h"
 #include "radeon_video.h"
 
diff --git a/src/radeon_video.c b/src/radeon_video.c
index cdd962b4..50a83552 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -10,7 +10,6 @@
 
 #include "radeon.h"
 #include "radeon_reg.h"
-#include "radeon_macros.h"
 #include "radeon_probe.h"
 #include "radeon_video.h"