Module: Mesa Branch: main Commit: 19fca131b179f1ba66d3171c5a04eb2223b26f4c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=19fca131b179f1ba66d3171c5a04eb2223b26f4c
Author: Yonggang Luo <luoyongg...@gmail.com> Date: Thu Jun 29 11:34:46 2023 +0800 amd: Use align64 instead of ALIGN for 64 bit value parameter Signed-off-by: Yonggang Luo <luoyongg...@gmail.com> Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26869> --- src/amd/common/ac_rgp_elf_object_pack.c | 2 +- src/amd/drm-shim/radeon_noop_drm_shim.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amd/common/ac_rgp_elf_object_pack.c b/src/amd/common/ac_rgp_elf_object_pack.c index 46aed499f82..b91af84d7db 100644 --- a/src/amd/common/ac_rgp_elf_object_pack.c +++ b/src/amd/common/ac_rgp_elf_object_pack.c @@ -532,7 +532,7 @@ ac_rgp_file_write_elf_object(FILE *output, size_t file_elf_start, sec_hdr[3].sh_name = (uintptr_t)((struct ac_rgp_elf_string_table*)0)->symtab; sec_hdr[3].sh_type = SHT_SYMTAB; sec_hdr[3].sh_offset = sec_hdr[2].sh_offset + - ALIGN(sec_hdr[2].sh_size, 256); + align64(sec_hdr[2].sh_size, 256); sec_hdr[3].sh_size = symbol_table_size; sec_hdr[3].sh_link = RGP_ELF_STRING_TBL_SEC_HEADER_INDEX; sec_hdr[3].sh_addralign = 8; diff --git a/src/amd/drm-shim/radeon_noop_drm_shim.c b/src/amd/drm-shim/radeon_noop_drm_shim.c index 04d147c2e22..8c9f9481927 100644 --- a/src/amd/drm-shim/radeon_noop_drm_shim.c +++ b/src/amd/drm-shim/radeon_noop_drm_shim.c @@ -93,7 +93,7 @@ radeon_ioctl_gem_create(int fd, unsigned long request, void *arg) struct shim_fd *shim_fd = drm_shim_fd_lookup(fd); struct shim_bo *bo = calloc(1, sizeof(*bo)); - size_t size = ALIGN(create->size, 4096); + size_t size = (size_t)align64(create->size, 4096); drm_shim_bo_init(bo, size);
