Mesa (staging/18.1): ac/surface: fix MSAA corruption on Vega due to FMASK tile swizzle

[GitLab Mirror]

Module: Mesa
Branch: staging/18.1
Commit: 948e06a4341d2c534e6b48cdf6affcd2665b1316
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=948e06a4341d2c534e6b48cdf6affcd2665b1316

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Jul 26 22:46:21 2018 -0400

ac/surface: fix MSAA corruption on Vega due to FMASK tile swizzle

a needle in the haystack?

Cc: 18.1 <mesa-stable at lists.freedesktop.org>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
(cherry picked from commit c5c6e0187fd5d535c304ca3fd62de0f5e636c0c2)

---

 src/amd/common/ac_surface.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c
index fc969df2d1..0ec3cbdeda 100644
--- a/src/amd/common/ac_surface.c
+++ b/src/amd/common/ac_surface.c
@@ -1111,7 +1111,7 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
 				/* This counter starts from 1 instead of 0. */
 				xin.surfIndex = p_atomic_inc_return(config->info.fmask_surf_index);
 				xin.flags = in->flags;
-				xin.swizzleMode = in->swizzleMode;
+				xin.swizzleMode = fin.swizzleMode;
 				xin.resourceType = in->resourceType;
 				xin.format = in->format;
 				xin.numSamples = in->numSamples;