Mesa (master): r600g: kill event type magic number in winsys

[Dave Airlie]

Module: Mesa
Branch: master
Commit: 6043ee6e62800f4f7d2c62756b4c91cbf2639061
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6043ee6e62800f4f7d2c62756b4c91cbf2639061

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Aug 17 15:16:53 2010 +1000

r600g: kill event type magic number in winsys

these events have names, use them.

---

 src/gallium/winsys/r600/drm/r600_state.c |    6 +++---
 src/gallium/winsys/r600/drm/r600d.h      |    2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gallium/winsys/r600/drm/r600_state.c b/src/gallium/winsys/r600/drm/r600_state.c
index d17d6e7..2facec7 100644
--- a/src/gallium/winsys/r600/drm/r600_state.c
+++ b/src/gallium/winsys/r600/drm/r600_state.c
@@ -233,7 +233,7 @@ static int r600_state_pm4_config(struct radeon_state *state)
 	state->pm4[state->cpm4++] = 0x80000000;
 	state->pm4[state->cpm4++] = 0x80000000;
 	state->pm4[state->cpm4++] = PKT3(PKT3_EVENT_WRITE, 0);
-	state->pm4[state->cpm4++] = 0x00000016;
+	state->pm4[state->cpm4++] = EVENT_TYPE_CACHE_FLUSH_AND_INV_EVENT;
 	state->pm4[state->cpm4++] = PKT3(PKT3_SET_CONFIG_REG, 1);
 	state->pm4[state->cpm4++] = 0x00000010;
 	state->pm4[state->cpm4++] = 0x00028000;
@@ -246,7 +246,7 @@ static int r700_state_pm4_config(struct radeon_state *state)
 	state->pm4[state->cpm4++] = 0x80000000;
 	state->pm4[state->cpm4++] = 0x80000000;
 	state->pm4[state->cpm4++] = PKT3(PKT3_EVENT_WRITE, 0);
-	state->pm4[state->cpm4++] = 0x00000016;
+	state->pm4[state->cpm4++] = EVENT_TYPE_CACHE_FLUSH_AND_INV_EVENT;
 	state->pm4[state->cpm4++] = PKT3(PKT3_SET_CONFIG_REG, 1);
 	state->pm4[state->cpm4++] = 0x00000010;
 	state->pm4[state->cpm4++] = 0x00028000;
@@ -314,7 +314,7 @@ static int r600_state_pm4_draw(struct radeon_state *state)
 		state->pm4[state->cpm4++] = state->states[R600_DRAW__VGT_DRAW_INITIATOR];
 	}
 	state->pm4[state->cpm4++] = PKT3(PKT3_EVENT_WRITE, 0);
-	state->pm4[state->cpm4++] = 0x00000016;
+	state->pm4[state->cpm4++] = EVENT_TYPE_CACHE_FLUSH_AND_INV_EVENT;
 	return 0;
 }
 
diff --git a/src/gallium/winsys/r600/drm/r600d.h b/src/gallium/winsys/r600/drm/r600d.h
index 5d13378..235b2b3 100644
--- a/src/gallium/winsys/r600/drm/r600d.h
+++ b/src/gallium/winsys/r600/drm/r600d.h
@@ -82,6 +82,8 @@
 #define PKT3_SET_CTL_CONST                     0x6F
 #define PKT3_SURFACE_BASE_UPDATE               0x73
 
+#define EVENT_TYPE_CACHE_FLUSH_AND_INV_EVENT   0x16
+
 #define PKT_TYPE_S(x)                   (((x) & 0x3) << 30)
 #define PKT_TYPE_G(x)                   (((x) >> 30) & 0x3)
 #define PKT_TYPE_C                      0x3FFFFFFF