radeonsi/gfx10: remove the disable_ngg option

because legacy VS hangs.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>

diff --git a/src/gallium/drivers/radeonsi/si_debug_options.h b/src/gallium/drivers/radeonsi/si_debug_options.h
index 9fdb0bc5dadaa6e41d7225ac01acbaeff55dc458..d6cb315763250328e332e739957fe0fdf29d9a05 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_debug_options.h
+++ b/src/gallium/drivers/radeonsi/si_debug_options.h
@@ -7,6 +7,5 @@ OPT_BOOL(debug_disassembly, false, "Report shader disassembly as part of driver
 OPT_BOOL(halt_shaders, false, "Halt shaders at the start (will hang)")
 OPT_BOOL(vs_fetch_always_opencode, false, "Always open code vertex fetches (less efficient, purely for testing)")
 OPT_BOOL(prim_restart_tri_strips_only, false, "Only enable primitive restart for triangle strips")
-OPT_BOOL(disable_ngg, false, "Unconditionally disable NGG (gfx10+)")
 
 #undef OPT_BOOL

diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index d13b008965b55f6b2306309568ac6792da44cdd3..a6ed0bdca300b665f9f39124410ed7770291d2c2 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -487,8 +487,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
        if (!sctx->border_color_map)
                goto fail;
 
-       if (sctx->chip_class >= GFX10)
-               sctx->ngg = !sscreen->options.disable_ngg;
+       sctx->ngg = sctx->chip_class >= GFX10;
 
        /* Initialize context functions used by graphics and compute. */
        if (sctx->chip_class >= GFX10)

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 52b3489509dd61a930cffa59f0bdf2975162ee4d..40572acc23a395f7b11f18565cbcd49a94bbbf05 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -2447,7 +2447,6 @@ static void si_init_shader_selector_async(void *job, int thread_index)
                                              sel->so.num_outputs != 0,
                                              &shader->key);
                if (sscreen->info.chip_class >= GFX10 &&
-                   !sscreen->options.disable_ngg &&
                    (((sel->type == PIPE_SHADER_VERTEX ||
                       sel->type == PIPE_SHADER_TESS_EVAL) &&
                      !shader->key.as_ls && !shader->key.as_es) ||
@@ -2982,8 +2981,7 @@ static void si_update_tess_uses_prim_id(struct si_context *sctx)
 
 static bool si_update_ngg(struct si_context *sctx)
 {
-       if (sctx->chip_class <= GFX9 ||
-           sctx->screen->options.disable_ngg)
+       if (sctx->chip_class <= GFX9)
                return false;
 
        bool new_ngg = true;