ac/drm: remove ac_drm_cs_create_syncobj
ac_drm_cs_create_syncobj2 is a simple replacement and this allows to remove some code. Tested-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> Acked-by: Rob Clark <robdclark@chromium.org> Acked-by: Marek Olšák <marek.olsak@amd.com> Acked-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34470>
This commit is contained in:
committed by
Marge Bot
parent
e0bd24672c
commit
80985767cb
@@ -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);
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user