OSDN Git Service

radeonsi/gfx9: don't set deprecated field PARTIAL_ES_WAVE_ON
authorMarek Olšák <marek.olsak@amd.com>
Sun, 23 Apr 2017 18:29:04 +0000 (20:29 +0200)
committerEmil Velikov <emil.l.velikov@gmail.com>
Sun, 30 Apr 2017 08:46:30 +0000 (09:46 +0100)
Cc: 17.1 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
(cherry picked from commit 80814819c28353a38c03d4cdba39983b8cf260ac)

src/gallium/drivers/radeonsi/si_state_draw.c

index 193187b..a354c69 100644 (file)
@@ -291,7 +291,8 @@ si_get_init_multi_vgt_param(struct si_screen *sscreen,
                /* Needed for 028B6C_DISTRIBUTION_MODE != 0 */
                if (sscreen->has_distributed_tess) {
                        if (key->u.uses_gs) {
-                               partial_es_wave = true;
+                               if (sscreen->b.chip_class <= VI)
+                                       partial_es_wave = true;
 
                                /* GPU hang workaround. */
                                if (sscreen->b.family == CHIP_TONGA ||
@@ -371,7 +372,7 @@ si_get_init_multi_vgt_param(struct si_screen *sscreen,
        }
 
        /* If SWITCH_ON_EOI is set, PARTIAL_ES_WAVE must be set too. */
-       if (ia_switch_on_eoi)
+       if (sscreen->b.chip_class <= VI && ia_switch_on_eoi)
                partial_es_wave = true;
 
        return S_028AA8_SWITCH_ON_EOP(ia_switch_on_eop) |