From d90fc82569934f7431281ffb3e9d89b01ff054a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sat, 29 Apr 2023 04:52:31 -0400 Subject: [PATCH] radeonsi: do AMD_DEBUG=nodisplaydcc differently to also remove modifiers Only modifiers with DCC retiling are removed for now. Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/si_pipe.c | 5 +++++ src/gallium/drivers/radeonsi/si_texture.c | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index e2b246e148e..8847a4422a3 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -1159,6 +1159,11 @@ static struct pipe_screen *radeonsi_screen_create_impl(struct radeon_winsys *ws, sscreen->debug_flags |= debug_get_flags_option("AMD_DEBUG", radeonsi_debug_options, 0); test_flags = debug_get_flags_option("AMD_TEST", test_options, 0); + if (sscreen->debug_flags & DBG(NO_DISPLAY_DCC)) { + sscreen->info.use_display_dcc_unaligned = false; + sscreen->info.use_display_dcc_with_retile_blit = false; + } + if (sscreen->debug_flags & DBG(NO_GFX)) sscreen->info.has_graphics = false; diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c index cd00c3f06ec..93e7692074e 100644 --- a/src/gallium/drivers/radeonsi/si_texture.c +++ b/src/gallium/drivers/radeonsi/si_texture.c @@ -226,9 +226,7 @@ static int si_init_surface(struct si_screen *sscreen, struct radeon_surf *surfac /* Shared textures must always set up DCC. If it's not present, it will be disabled by * si_get_opaque_metadata later. */ - if (!is_imported && - (sscreen->debug_flags & DBG(NO_DCC) || - (ptex->bind & PIPE_BIND_SCANOUT && sscreen->debug_flags & DBG(NO_DISPLAY_DCC)))) + if (!is_imported && sscreen->debug_flags & DBG(NO_DCC)) flags |= RADEON_SURF_DISABLE_DCC; /* R9G9B9E5 isn't supported for rendering by older generations. */