From ab1f39f07f6a14dbdb5d97341950d245ba73b8a3 Mon Sep 17 00:00:00 2001 From: Slawomir Milczarek Date: Thu, 24 Apr 2025 09:09:59 +0000 Subject: [PATCH] refactor: Remove ioctl helper for context destruction Related-To: NEO-12952 Signed-off-by: Slawomir Milczarek --- shared/source/os_interface/linux/ioctl_helper.cpp | 4 ---- shared/source/os_interface/linux/ioctl_helper.h | 1 - shared/source/os_interface/linux/os_context_linux.cpp | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/shared/source/os_interface/linux/ioctl_helper.cpp b/shared/source/os_interface/linux/ioctl_helper.cpp index 3533d0c28a..d32891d583 100644 --- a/shared/source/os_interface/linux/ioctl_helper.cpp +++ b/shared/source/os_interface/linux/ioctl_helper.cpp @@ -153,8 +153,4 @@ BufferObject *IoctlHelper::allocUserptr(DrmMemoryManager &memoryManager, const A return memoryManager.allocUserptr(address, size, allocData.type, rootDeviceIndex); } -void IoctlHelper::destroyDrmContext(Drm &drm, OsContextLinux &osContext, uint32_t drmContextId) { - drm.destroyDrmContext(drmContextId); -} - } // namespace NEO diff --git a/shared/source/os_interface/linux/ioctl_helper.h b/shared/source/os_interface/linux/ioctl_helper.h index 8ea49971ca..50b8a4d3cb 100644 --- a/shared/source/os_interface/linux/ioctl_helper.h +++ b/shared/source/os_interface/linux/ioctl_helper.h @@ -171,7 +171,6 @@ class IoctlHelper { virtual bool checkIfIoctlReinvokeRequired(int error, DrmIoctl ioctlRequest) const; virtual int createDrmContext(Drm &drm, OsContextLinux &osContext, uint32_t drmVmId, uint32_t deviceIndex, bool allocateInterrupt) = 0; - virtual void destroyDrmContext(Drm &drm, OsContextLinux &osContext, uint32_t drmContextId); virtual bool createMediaContext(uint32_t vmId, void *controlSharedMemoryBuffer, uint32_t controlSharedMemoryBufferSize, void *controlBatchBuffer, uint32_t controlBatchBufferSize, void *&outDoorbell) { return false; } virtual bool releaseMediaContext(void *doorbellHandle) { return false; } diff --git a/shared/source/os_interface/linux/os_context_linux.cpp b/shared/source/os_interface/linux/os_context_linux.cpp index 73b6a68361..4fd5a3d224 100644 --- a/shared/source/os_interface/linux/os_context_linux.cpp +++ b/shared/source/os_interface/linux/os_context_linux.cpp @@ -174,7 +174,7 @@ uint64_t OsContextLinux::getOfflineDumpContextId(uint32_t deviceIndex) const { OsContextLinux::~OsContextLinux() { if (contextInitialized) { for (auto drmContextId : drmContextIds) { - drm.getIoctlHelper()->destroyDrmContext(drm, *this, drmContextId); + drm.destroyDrmContext(drmContextId); } } drmContextIds.clear();