Module: Mesa Branch: main Commit: 32d2f7074280acc194282a10ad0c2a7f42c299dc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=32d2f7074280acc194282a10ad0c2a7f42c299dc
Author: Yonggang Luo <luoyongg...@gmail.com> Date: Fri Dec 8 00:27:44 2023 +0800 nouveau: Use align64 instead of ALIGN over input layer_size_B layer_size_B is uint64_t, so use align64 over it Because array_stride_B is uint32_t, so cast back to uint32_t Signed-off-by: Yonggang Luo <luoyongg...@gmail.com> Reviewed-by: Marek Olšák <marek.ol...@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23932> --- src/nouveau/nil/nil_image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nouveau/nil/nil_image.c b/src/nouveau/nil/nil_image.c index e7f1e8f3517..3f905e4bddd 100644 --- a/src/nouveau/nil/nil_image.c +++ b/src/nouveau/nil/nil_image.c @@ -464,7 +464,7 @@ nil_image_init(struct nv_device_info *dev, image->align_B = nil_tiling_size_B(image->levels[0].tiling); /* I have no idea why but hardware seems to align layer strides */ - image->array_stride_B = ALIGN(layer_size_B, image->align_B); + image->array_stride_B = (uint32_t)align64(layer_size_B, image->align_B); image->size_B = (uint64_t)image->array_stride_B * image->extent_px.a;
