From: Marek Olšák <marek.olsak@amd.com>
Date: Fri, 20 Dec 2019 21:19:54 +0000 (-0500)
Subject: ac/surface: fix an assertion failure on gfx9 in CMASK computation
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7d65614422736de32214fc28b0054692f4e5e48f;p=mesa.git

ac/surface: fix an assertion failure on gfx9 in CMASK computation

addrlib only allows the 2D resource type with CMASK.

Fixes: 69ea473eeb9 "amd/addrlib: update to the latest version"

Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3187>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3187>
---

diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c
index 09f2bb75ea0..81c77e280ae 100644
--- a/src/amd/common/ac_surface.c
+++ b/src/amd/common/ac_surface.c
@@ -1352,6 +1352,7 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
 
 		/* CMASK -- on GFX10 only for FMASK */
 		if (in->swizzleMode != ADDR_SW_LINEAR &&
+		    in->resourceType == ADDR_RSRC_TEX_2D &&
 		    ((info->chip_class <= GFX9 && in->numSamples == 1) ||
 		     (surf->fmask_size && in->numSamples >= 2))) {
 			ADDR2_COMPUTE_CMASK_INFO_INPUT cin = {0};