radeonsi/gfx10: add AMD_DEBUG=nongg

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index a0ad77435cb1e87e9d20adaa933807872db9c780..487d9254a6bd778fee302f28846b27395ec7545c 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -89,6 +89,7 @@ static const struct debug_named_value debug_options[] = {
 
        /* 3D engine options: */
        { "nogfx", DBG(NO_GFX), "Disable graphics. Only multimedia compute paths can be used." },
+       { "nongg", DBG(NO_NGG), "Disable NGG and use the legacy pipeline." },
        { "alwayspd", DBG(ALWAYS_PD), "Always enable the primitive discard compute shader." },
        { "pd", DBG(PD), "Enable the primitive discard compute shader for large draw calls." },
        { "nopd", DBG(NO_PD), "Disable the primitive discard compute shader." },
@@ -1123,7 +1124,8 @@ radeonsi_screen_create_impl(struct radeon_winsys *ws,
        }
 
        sscreen->use_ngg = sscreen->info.chip_class >= GFX10 &&
-                          sscreen->info.family != CHIP_NAVI14;
+                          sscreen->info.family != CHIP_NAVI14 &&
+                          !(sscreen->debug_flags & DBG(NO_NGG));
        sscreen->use_ngg_streamout = false;
 
        /* Only enable primitive binning on APUs by default. */

diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index c9a415622c35bf562defcfff05e13341c1c38f18..b0495f0841b7b8880a5ed433240e116cd26c4481 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -175,6 +175,7 @@ enum {
 
        /* 3D engine options: */
        DBG_NO_GFX,
+       DBG_NO_NGG,
        DBG_ALWAYS_PD,
        DBG_PD,
        DBG_NO_PD,