[Mesa-dev] [PATCH 1/3] ac/surface: fix MSAA corruption on Vega due to FMASK tile swizzle

[Marek Olšák]

From: Marek Olšák <marek.olsak at amd.com>

a needle in the haystack?

Cc: 18.1 <mesa-stable at lists.freedesktop.org>
---
 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 afdae1971e9..2f4f0f8884f 100644
--- a/src/amd/common/ac_surface.c
+++ b/src/amd/common/ac_surface.c
@@ -1295,21 +1295,21 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
 			    !(surf->flags & RADEON_SURF_SHAREABLE)) {
 				ADDR2_COMPUTE_PIPEBANKXOR_INPUT xin = {0};
 				ADDR2_COMPUTE_PIPEBANKXOR_OUTPUT xout = {0};
 
 				xin.size = sizeof(ADDR2_COMPUTE_PIPEBANKXOR_INPUT);
 				xout.size = sizeof(ADDR2_COMPUTE_PIPEBANKXOR_OUTPUT);
 
 				/* 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;
 				xin.numFrags = in->numFrags;
 
 				ret = Addr2ComputePipeBankXor(addrlib, &xin, &xout);
 				if (ret != ADDR_OK)
 					return ret;
 
 				assert(xout.pipeBankXor <=
-- 
2.17.1