From 80985767cb44f96d5ab34a7c378772a22c88e1bc Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Fri, 7 Mar 2025 14:31:31 +0100 Subject: [PATCH] ac/drm: remove ac_drm_cs_create_syncobj MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ac_drm_cs_create_syncobj2 is a simple replacement and this allows to remove some code. Tested-by: Dmitry Osipenko Acked-by: Rob Clark Acked-by: Marek Olšák Acked-by: Samuel Pitoiset Part-of: --- src/amd/common/ac_linux_drm.c | 5 ----- src/amd/common/ac_linux_drm.h | 1 - src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp | 2 +- src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 2 +- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/amd/common/ac_linux_drm.c b/src/amd/common/ac_linux_drm.c index 206cc4e5e79..3435d20d375 100644 --- a/src/amd/common/ac_linux_drm.c +++ b/src/amd/common/ac_linux_drm.c @@ -434,11 +434,6 @@ int ac_drm_cs_create_syncobj2(int device_fd, uint32_t flags, uint32_t *handle) return drmSyncobjCreate(device_fd, flags, handle); } -int ac_drm_cs_create_syncobj(int device_fd, uint32_t *handle) -{ - return drmSyncobjCreate(device_fd, 0, handle); -} - int ac_drm_cs_destroy_syncobj(int device_fd, uint32_t handle) { return drmSyncobjDestroy(device_fd, handle); diff --git a/src/amd/common/ac_linux_drm.h b/src/amd/common/ac_linux_drm.h index b71e4b9e3cf..15b6e303f59 100644 --- a/src/amd/common/ac_linux_drm.h +++ b/src/amd/common/ac_linux_drm.h @@ -88,7 +88,6 @@ PROC int ac_drm_cs_query_fence_status(ac_drm_device *dev, uint32_t ctx_id, uint3 uint32_t ip_instance, uint32_t ring, uint64_t fence_seq_no, uint64_t timeout_ns, uint64_t flags, uint32_t *expired) TAIL; PROC int ac_drm_cs_create_syncobj2(int device_fd, uint32_t flags, uint32_t *handle) TAIL; -PROC int ac_drm_cs_create_syncobj(int device_fd, uint32_t *handle) TAIL; PROC int ac_drm_cs_destroy_syncobj(int device_fd, uint32_t handle) TAIL; PROC int ac_drm_cs_syncobj_wait(int device_fd, uint32_t *handles, unsigned num_handles, int64_t timeout_nsec, unsigned flags, diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp index fad47ea81d0..91d2f1be981 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp @@ -100,7 +100,7 @@ amdgpu_fence_import_sync_file(struct radeon_winsys *rws, int fd) /* fence->ctx == NULL means that the fence is syncobj-based. */ /* Convert sync_file into syncobj. */ - int r = ac_drm_cs_create_syncobj(aws->fd, &fence->syncobj); + int r = ac_drm_cs_create_syncobj2(aws->fd, 0, &fence->syncobj); if (r) { FREE(fence); return NULL; diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c index 0e3980ed83d..a5b81bb8d11 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c @@ -456,7 +456,7 @@ amdgpu_winsys_create(int fd, const struct pipe_screen_config *config, aws->info.drm_major = drm_major; aws->info.drm_minor = drm_minor; - if (ac_drm_cs_create_syncobj(aws->fd, &aws->vm_timeline_syncobj)) + if (ac_drm_cs_create_syncobj2(aws->fd, 0, &aws->vm_timeline_syncobj)) goto fail_alloc; simple_mtx_init(&aws->vm_ioctl_lock, mtx_plain);