diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2018-08-28 14:39:09 -0400 |
|---|---|---|
| committer | Andres Gomez <agomez@igalia.com> | 2018-08-30 15:57:08 +0300 |
| commit | ccf5b1284a53c7d9e1e5a5cfb56e94e733c166e6 (patch) | |
| tree | 4e7a2bb7223bfd5816f9c650950f7baf60882ac3 | |
| parent | 7cd3674fbfc9d7fe9c72b029c609200bcf3e006a (diff) | |
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 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
(cherry picked from commit 1e40f6948310be07abb2d0198e6602769892cdac)
| -rw-r--r-- | src/amd/common/ac_surface.c | 4 |
1 files changed, 2 insertions, 2 deletions
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. */ |