winsys/radeon: fix CMASK fast clear for NPOT textures with mipmapping on SI/CI

Cc: 18.2 <mesa-stable@lists.freedesktop.org>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>

diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_surface.c b/src/gallium/winsys/radeon/drm/radeon_drm_surface.c
index fda1ba7870ebd387a591da564382a2d82f87bf90..20cfc86ebe04d761e233639d6e025654627dfa59 100644 (file)
--- a/src/gallium/winsys/radeon/drm/radeon_drm_surface.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_surface.c
@@ -257,8 +257,8 @@ static void si_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. */