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 <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22771>
This commit is contained in:
Marek Olšák 2023-04-29 04:52:31 -04:00 committed by Marge Bot
parent 8c8b5a8fbd
commit d90fc82569
2 changed files with 6 additions and 3 deletions

View file

@ -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;

View file

@ -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. */