From 55cf97f56edbfbaaff646131fc9e1299b38af355 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 6 Jul 2020 18:01:25 -0400 Subject: [PATCH] Revert "ac/surface: require that gfx8 doesn't have DCC in order to be displayable" This reverts commit 7406ea37e6b666d474ab62982ca333d518c84231. Fixes: 7406ea37 "ac/surface: require that gfx8 doesn't have DCC in order to be displayable" Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3190 Acked-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/amd/common/ac_surface.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c index 905f33c8642..169b9737a0c 100644 --- a/src/amd/common/ac_surface.c +++ b/src/amd/common/ac_surface.c @@ -1120,10 +1120,9 @@ static int gfx6_compute_surface(ADDR_HANDLE addrlib, } surf->is_linear = surf->u.legacy.level[0].mode == RADEON_SURF_MODE_LINEAR_ALIGNED; - surf->is_displayable = (surf->is_linear || - surf->micro_tile_mode == RADEON_MICRO_MODE_DISPLAY || - surf->micro_tile_mode == RADEON_MICRO_MODE_RENDER /* rotated */) && - !surf->dcc_size; + surf->is_displayable = surf->is_linear || + surf->micro_tile_mode == RADEON_MICRO_MODE_DISPLAY || + surf->micro_tile_mode == RADEON_MICRO_MODE_RENDER; /* The rotated micro tile mode doesn't work if both CMASK and RB+ are * used at the same time. This case is not currently expected to occur -- 2.30.2