From: Marek Olšák <marek.olsak@amd.com>
Date: Fri, 27 Jul 2018 02:46:21 +0000 (-0400)
Subject: ac/surface: fix MSAA corruption on Vega due to FMASK tile swizzle
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c5c6e0187fd5d535c304ca3fd62de0f5e636c0c2;p=mesa.git

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

a needle in the haystack?

Cc: 18.1 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
---

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
@@ -1302,7 +1302,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;