diff --git a/shared/source/os_interface/linux/drm_wrappers.h b/shared/source/os_interface/linux/drm_wrappers.h index a3f98aceee..5ed9e07726 100644 --- a/shared/source/os_interface/linux/drm_wrappers.h +++ b/shared/source/os_interface/linux/drm_wrappers.h @@ -260,9 +260,6 @@ enum class DrmIoctl { GemClosReserve, GemClosFree, GemCacheReserve, - SyncobjCreate, - SyncobjWait, - SyncobjDestroy, Version, }; diff --git a/shared/source/os_interface/linux/xe/ioctl_helper_xe.cpp b/shared/source/os_interface/linux/xe/ioctl_helper_xe.cpp index 39d47d1c08..91c03bf940 100644 --- a/shared/source/os_interface/linux/xe/ioctl_helper_xe.cpp +++ b/shared/source/os_interface/linux/xe/ioctl_helper_xe.cpp @@ -784,12 +784,6 @@ bool IoctlHelperXe::isDebugAttachAvailable() { unsigned int IoctlHelperXe::getIoctlRequestValue(DrmIoctl ioctlRequest) const { xeLog(" -> IoctlHelperXe::%s 0x%x\n", __FUNCTION__, ioctlRequest); switch (ioctlRequest) { - case DrmIoctl::SyncobjCreate: - RETURN_ME(DRM_IOCTL_SYNCOBJ_CREATE); - case DrmIoctl::SyncobjWait: - RETURN_ME(DRM_IOCTL_SYNCOBJ_WAIT); - case DrmIoctl::SyncobjDestroy: - RETURN_ME(DRM_IOCTL_SYNCOBJ_DESTROY); case DrmIoctl::GemClose: RETURN_ME(DRM_IOCTL_GEM_CLOSE); case DrmIoctl::GemVmCreate: @@ -862,12 +856,6 @@ void IoctlHelperXe::xeLog(XeLogArgs &&...args) const { std::string IoctlHelperXe::getIoctlString(DrmIoctl ioctlRequest) const { switch (ioctlRequest) { - case DrmIoctl::SyncobjCreate: - STRINGIFY_ME(DRM_IOCTL_SYNCOBJ_CREATE); - case DrmIoctl::SyncobjWait: - STRINGIFY_ME(DRM_IOCTL_SYNCOBJ_WAIT); - case DrmIoctl::SyncobjDestroy: - STRINGIFY_ME(DRM_IOCTL_SYNCOBJ_DESTROY); case DrmIoctl::GemClose: STRINGIFY_ME(DRM_IOCTL_GEM_CLOSE); case DrmIoctl::GemVmCreate: @@ -901,42 +889,6 @@ std::string IoctlHelperXe::getIoctlString(DrmIoctl ioctlRequest) const { } } -uint32_t IoctlHelperXe::xeSyncObjCreate(uint32_t flags) { - int ret; - struct drm_syncobj_create create = {}; - create.flags = flags; - ret = IoctlHelper::ioctl(DrmIoctl::SyncobjCreate, &create); - UNRECOVERABLE_IF(ret); - return create.handle; -} - -bool IoctlHelperXe::xeSyncObjWait(uint32_t *handles, uint32_t count, - uint64_t absTimeoutNsec, uint32_t flags, - uint32_t *firstSignaled) { - int ret; - struct drm_syncobj_wait wait = {}; - wait.handles = castToUint64(handles); - wait.timeout_nsec = absTimeoutNsec; - wait.count_handles = count; - wait.flags = flags; - ret = IoctlHelper::ioctl(DrmIoctl::SyncobjWait, &wait); - if (ret && errno == ETIME) { - return false; - } - UNRECOVERABLE_IF(ret); - if (firstSignaled) - *firstSignaled = wait.first_signaled; - return true; -} - -void IoctlHelperXe::xeSyncObjDestroy(uint32_t handle) { - int ret; - struct drm_syncobj_destroy destroy = {}; - destroy.handle = handle; - ret = IoctlHelper::ioctl(DrmIoctl::SyncobjDestroy, &destroy); - UNRECOVERABLE_IF(ret); -} - int IoctlHelperXe::ioctl(DrmIoctl request, void *arg) { int ret = -1; xeLog(" => IoctlHelperXe::%s 0x%x\n", __FUNCTION__, request); diff --git a/shared/source/os_interface/linux/xe/ioctl_helper_xe.h b/shared/source/os_interface/linux/xe/ioctl_helper_xe.h index 6e8cc69a63..cc9de31f0f 100644 --- a/shared/source/os_interface/linux/xe/ioctl_helper_xe.h +++ b/shared/source/os_interface/linux/xe/ioctl_helper_xe.h @@ -111,9 +111,6 @@ class IoctlHelperXe : public IoctlHelper { private: template void xeLog(XeLogArgs &&...args) const; - uint32_t xeSyncObjCreate(uint32_t flags); - bool xeSyncObjWait(uint32_t *handles, uint32_t count, uint64_t absTimeoutNsec, uint32_t flags, uint32_t *firstSignaled); - void xeSyncObjDestroy(uint32_t handle); int xeGetQuery(Query *data); struct drm_xe_engine_class_instance *xeFindMatchingEngine(uint16_t engineClass, uint16_t engineInstance); diff --git a/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp b/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp index b7711c84a8..0646039304 100644 --- a/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp @@ -22,9 +22,6 @@ #include "drm/xe_drm.h" using namespace NEO; -using NEO::PrelimI915::drm_syncobj_create; -using NEO::PrelimI915::drm_syncobj_destroy; -using NEO::PrelimI915::drm_syncobj_wait; struct MockIoctlHelperXe : IoctlHelperXe { using IoctlHelperXe::bindInfo; @@ -613,9 +610,6 @@ TEST(IoctlHelperXeTest, givenIoctlHelperXeWhenCallingAnyMethodThenDummyValueIsRe verifyDrmParamString("TilingNone", DrmParam::TilingNone); verifyDrmParamString("TilingY", DrmParam::TilingY); - verifyIoctlString(DrmIoctl::SyncobjCreate, "DRM_IOCTL_SYNCOBJ_CREATE"); - verifyIoctlString(DrmIoctl::SyncobjWait, "DRM_IOCTL_SYNCOBJ_WAIT"); - verifyIoctlString(DrmIoctl::SyncobjDestroy, "DRM_IOCTL_SYNCOBJ_DESTROY"); verifyIoctlString(DrmIoctl::GemClose, "DRM_IOCTL_GEM_CLOSE"); verifyIoctlString(DrmIoctl::GemCreate, "DRM_IOCTL_XE_GEM_CREATE"); verifyIoctlString(DrmIoctl::GemVmCreate, "DRM_IOCTL_XE_VM_CREATE"); @@ -663,9 +657,6 @@ TEST(IoctlHelperXeTest, whenGettingIoctlRequestValueThenPropertValueIsReturned) verifyIoctlRequestValue(DRM_IOCTL_XE_GEM_CREATE, DrmIoctl::GemCreate); verifyIoctlRequestValue(DRM_IOCTL_XE_VM_BIND, DrmIoctl::GemVmBind); verifyIoctlRequestValue(DRM_IOCTL_XE_VM_CREATE, DrmIoctl::GemVmCreate); - verifyIoctlRequestValue(DRM_IOCTL_SYNCOBJ_CREATE, DrmIoctl::SyncobjCreate); - verifyIoctlRequestValue(DRM_IOCTL_SYNCOBJ_WAIT, DrmIoctl::SyncobjWait); - verifyIoctlRequestValue(DRM_IOCTL_SYNCOBJ_DESTROY, DrmIoctl::SyncobjDestroy); verifyIoctlRequestValue(DRM_IOCTL_GEM_CLOSE, DrmIoctl::GemClose); verifyIoctlRequestValue(DRM_IOCTL_XE_VM_DESTROY, DrmIoctl::GemVmDestroy); verifyIoctlRequestValue(DRM_IOCTL_XE_GEM_MMAP_OFFSET, DrmIoctl::GemMmapOffset);