Mesa (master): r600: fixes for register definitions.

[Dave Airlie]

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

Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Nov 30 09:35:37 2015 +1000

r600: fixes for register definitions.

Forgot to add these.

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

---

 src/gallium/drivers/r600/evergreend.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/r600/evergreend.h b/src/gallium/drivers/r600/evergreend.h
index 33fb02c..3f60e3e 100644
--- a/src/gallium/drivers/r600/evergreend.h
+++ b/src/gallium/drivers/r600/evergreend.h
@@ -492,8 +492,8 @@
 #define   C_028B6C_BUFFER_ACCESS_MODE                                 0xFFFFFDFF
 #define     V_028B6C_PATCH_MAJOR                                    0x00
 #define     V_028B6C_TF_MAJOR                                       0x01
-#define   S_028B6C_NUM_DS_WAVES_PER_SIMD                              (((x) & 0xf) << 10)
-#define   G_028B6C_NUM_DS_WAVES_PER_SIMD                              (((x) >> 10) & 0xF)
+#define   S_028B6C_NUM_DS_WAVES_PER_SIMD(x)                           (((x) & 0xf) << 10)
+#define   G_028B6C_NUM_DS_WAVES_PER_SIMD(x)                           (((x) >> 10) & 0xF)
 #define   C_028B6C_NUM_DS_WAVES_PER_SIMD                              0xFFFFC3FF
 
 #define R_028B74_VGT_DISPATCH_INITIATOR              0x028B74
@@ -2159,7 +2159,7 @@
 #define   G_028B64_HS_TOTAL_OUTPUT(x)                                 (((x) >> 0) & 0x1FFF)
 #define   C_028B64_HS_TOTAL_OUTPUT                                    0xFFFFE000
 #define   S_028B64_LS_HS_TOTAL_OUTPUT(x)                              (((x) & 0x1FFF) << 13)
-#define   C_028B64_LS_HS_TOTAL_OUTPUT(x)                              (((x) >> 13) & 0x1FFF)
+#define   G_028B64_LS_HS_TOTAL_OUTPUT(x)                              (((x) >> 13) & 0x1FFF)
 #define   C_028B64_LS_HS_TOTAL_OUTPUT                                 0xFC001FFF
 #define R_028B68_VGT_HS_PATCH_CONST                  0x00028B68
 #define   S_028B68_SIZE(x)                                            (((x) & 0x1FFF) << 0)