[Mesa-dev] [PATCH v2 1/2] radeonsi: Use defines for CONTEXT_CONTROL instead of magic values.

[Bas Nieuwenhuizen]

v2: Use field names provided by Nicolai.

Signed-off-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
---

Sending this with the changed names, as they seem  double to me.  Should
I just lose the register name, and optionally add a CONTEXT_CONTROL prefix?

 src/gallium/drivers/radeonsi/si_state.c | 4 ++--
 src/gallium/drivers/radeonsi/sid.h      | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 305a70b..e195eaf 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -3821,8 +3821,8 @@ static void si_init_config(struct si_context *sctx)
 		return;
 
 	si_pm4_cmd_begin(pm4, PKT3_CONTEXT_CONTROL);
-	si_pm4_cmd_add(pm4, 0x80000000);
-	si_pm4_cmd_add(pm4, 0x80000000);
+	si_pm4_cmd_add(pm4, LOAD_CONTROL_LOAD_ENABLE(1));
+	si_pm4_cmd_add(pm4, SHADOW_ENABLE_SHADOW_ENABLE(1));
 	si_pm4_cmd_end(pm4, false);
 
 	si_pm4_set_reg(pm4, R_028A18_VGT_HOS_MAX_TESS_LEVEL, fui(64));
diff --git a/src/gallium/drivers/radeonsi/sid.h b/src/gallium/drivers/radeonsi/sid.h
index 516e114..34ced0e 100644
--- a/src/gallium/drivers/radeonsi/sid.h
+++ b/src/gallium/drivers/radeonsi/sid.h
@@ -88,6 +88,9 @@
 #define PKT3_INDEX_BASE                        0x26
 #define PKT3_DRAW_INDEX_2                      0x27
 #define PKT3_CONTEXT_CONTROL                   0x28
+#define     LOAD_CONTROL_LOAD_ENABLE(x)        (((x) & 0x1) << 31)
+#define     LOAD_CONTROL_LOAD_CE_RAM(x)        (((x) & 0x1) << 28)
+#define     SHADOW_ENABLE_SHADOW_ENABLE(x)     (((x) & 0x1) << 31)
 #define PKT3_INDEX_TYPE                        0x2A
 #define PKT3_DRAW_INDIRECT_MULTI               0x2C
 #define PKT3_DRAW_INDEX_AUTO                   0x2D
-- 
2.8.0