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

Author: Marek Olšák <[email protected]>
Date:   Tue Aug  6 19:49:16 2019 -0400

radeonsi/gfx10: don't set PA_SC_TILE_STEERING_OVERRIDE if CLEAR_STATE sets it

Reviewed-by: Pierre-Eric Pelloux-Prayer <[email protected]>

---

 src/gallium/drivers/radeonsi/si_state.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_state.c 
b/src/gallium/drivers/radeonsi/si_state.c
index 0ae89b821ff..12636dbeab7 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -5603,8 +5603,11 @@ static void si_init_config(struct si_context *sctx)
                si_pm4_set_reg(pm4, R_028C50_PA_SC_NGG_MODE_CNTL,
                               S_028C50_MAX_DEALLOCS_IN_WAVE(512));
                si_pm4_set_reg(pm4, R_028C58_VGT_VERTEX_REUSE_BLOCK_CNTL, 14);
-               si_pm4_set_reg(pm4, R_02835C_PA_SC_TILE_STEERING_OVERRIDE,
-                              sscreen->info.pa_sc_tile_steering_override);
+
+               if (!has_clear_state) {
+                       si_pm4_set_reg(pm4, 
R_02835C_PA_SC_TILE_STEERING_OVERRIDE,
+                                      
sscreen->info.pa_sc_tile_steering_override);
+               }
 
                si_pm4_set_reg(pm4, R_02807C_DB_RMI_L2_CACHE_CONTROL,
                               S_02807C_Z_WR_POLICY(V_02807C_CACHE_STREAM_WR) |

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to