Mesa (master): ac/surface: require that gfx8 doesn't have DCC in order to be displayable

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 7406ea37e6b666d474ab62982ca333d518c84231
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7406ea37e6b666d474ab62982ca333d518c84231

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Jun 11 04:20:44 2020 -0400

ac/surface: require that gfx8 doesn't have DCC in order to be displayable

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5424>

---

 src/amd/common/ac_surface.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c
index 4ef72b1b323..be55e6deaaa 100644
--- a/src/amd/common/ac_surface.c
+++ b/src/amd/common/ac_surface.c
@@ -1120,9 +1120,10 @@ 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;
+	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;
 
 	/* 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