From: Marek Olšák Date: Tue, 28 Aug 2018 18:39:09 +0000 (-0400) Subject: ac/surface: fix CMASK fast clear for NPOT textures with mipmapping on SI/CI/VI X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1e40f6948310be07abb2d0198e6602769892cdac;p=mesa.git ac/surface: fix CMASK fast clear for NPOT textures with mipmapping on SI/CI/VI This fixes VM faults and corruption. Cc: 18.1 18.2 Reviewed-by: Bas Nieuwenhuizen --- diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c index 2f4f0f8884f..94723dc9c09 100644 --- a/src/amd/common/ac_surface.c +++ b/src/amd/common/ac_surface.c @@ -588,8 +588,8 @@ void ac_compute_cmask(const struct radeon_info *info, unsigned base_align = num_pipes * pipe_interleave_bytes; - unsigned width = align(config->info.width, cl_width*8); - unsigned height = align(config->info.height, cl_height*8); + unsigned width = align(surf->u.legacy.level[0].nblk_x, cl_width*8); + unsigned height = align(surf->u.legacy.level[0].nblk_y, cl_height*8); unsigned slice_elements = (width * height) / (8*8); /* Each element of CMASK is a nibble. */