diff --git a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp index 5fd2967ff2..e00f8ad2e8 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp @@ -2627,7 +2627,6 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenLockUnlockIsCalledOnAlloca TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenLockUnlockIsCalledOnAllocationWithoutCpuPtrThenReturnLockedPtrAndSetCpuDomain) { mock->ioctl_expected.gemCreate = 1; mock->ioctl_expected.gemMmapOffset = 1; - mock->ioctl_expected.gemMmap = 0; mock->ioctl_expected.gemSetDomain = 0; mock->ioctl_expected.gemSetTiling = 1; mock->ioctl_expected.gemWait = 1; @@ -2656,12 +2655,10 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenLockUnlockIsCalledOnAlloca auto drmAllocation = static_cast(allocation); EXPECT_NE(nullptr, drmAllocation->getBO()->peekLockedAddress()); - // check DRM_IOCTL_I915_GEM_MMAP input params + // check DRM_IOCTL_I915_GEM_MMAP_OFFSET input params EXPECT_EQ((uint32_t)drmAllocation->getBO()->peekHandle(), mock->mmapOffsetHandle); - EXPECT_EQ(0u, mock->mmapPad); - EXPECT_EQ(0u, mock->mmapOffset); - EXPECT_EQ(0u, mock->mmapSize); - EXPECT_EQ(0u, mock->mmapFlags); + EXPECT_EQ(0u, mock->mmapOffsetPad); + EXPECT_EQ(static_cast(I915_MMAP_OFFSET_WC), mock->mmapOffsetFlags); memoryManager->unlockResource(allocation); EXPECT_EQ(nullptr, drmAllocation->getBO()->peekLockedAddress()); diff --git a/shared/source/os_interface/linux/drm_wrappers.cpp b/shared/source/os_interface/linux/drm_wrappers.cpp index 24e73362c4..cc32d5e8cd 100644 --- a/shared/source/os_interface/linux/drm_wrappers.cpp +++ b/shared/source/os_interface/linux/drm_wrappers.cpp @@ -87,14 +87,6 @@ static_assert(offsetof(GemMmapOffset, offset) == offsetof(drm_i915_gem_mmap_offs static_assert(offsetof(GemMmapOffset, flags) == offsetof(drm_i915_gem_mmap_offset, flags)); static_assert(offsetof(GemMmapOffset, extensions) == offsetof(drm_i915_gem_mmap_offset, extensions)); -static_assert(sizeof(GemMmap) == sizeof(drm_i915_gem_mmap)); -static_assert(offsetof(GemMmap, handle) == offsetof(drm_i915_gem_mmap, handle)); -static_assert(offsetof(GemMmap, pad) == offsetof(drm_i915_gem_mmap, pad)); -static_assert(offsetof(GemMmap, offset) == offsetof(drm_i915_gem_mmap, offset)); -static_assert(offsetof(GemMmap, size) == offsetof(drm_i915_gem_mmap, size)); -static_assert(offsetof(GemMmap, addrPtr) == offsetof(drm_i915_gem_mmap, addr_ptr)); -static_assert(offsetof(GemMmap, flags) == offsetof(drm_i915_gem_mmap, flags)); - static_assert(sizeof(GemSetDomain) == sizeof(drm_i915_gem_set_domain)); static_assert(offsetof(GemSetDomain, handle) == offsetof(drm_i915_gem_set_domain, handle)); static_assert(offsetof(GemSetDomain, readDomains) == offsetof(drm_i915_gem_set_domain, read_domains)); diff --git a/shared/source/os_interface/linux/drm_wrappers.h b/shared/source/os_interface/linux/drm_wrappers.h index de5cc8f94f..4e27e37d92 100644 --- a/shared/source/os_interface/linux/drm_wrappers.h +++ b/shared/source/os_interface/linux/drm_wrappers.h @@ -100,15 +100,6 @@ struct GemMmapOffset { uint64_t extensions; }; -struct GemMmap { - uint32_t handle; - uint32_t pad; - uint64_t offset; - uint64_t size; - uint64_t addrPtr; - uint64_t flags; -}; - struct GemSetDomain { uint32_t handle; uint32_t readDomains; @@ -216,7 +207,6 @@ enum class DrmIoctl { GemContextGetparam, GemContextSetparam, Query, - GemMmap, GemMmapOffset, GemVmCreate, GemVmDestroy, diff --git a/shared/source/os_interface/linux/ioctl_helper.cpp b/shared/source/os_interface/linux/ioctl_helper.cpp index 385935e33f..ce13fc7c4a 100644 --- a/shared/source/os_interface/linux/ioctl_helper.cpp +++ b/shared/source/os_interface/linux/ioctl_helper.cpp @@ -166,8 +166,6 @@ unsigned int IoctlHelper::getIoctlRequestValueBase(DrmIoctl ioctlRequest) const return DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM; case DrmIoctl::Query: return DRM_IOCTL_I915_QUERY; - case DrmIoctl::GemMmap: - return DRM_IOCTL_I915_GEM_MMAP; case DrmIoctl::PrimeFdToHandle: return DRM_IOCTL_PRIME_FD_TO_HANDLE; case DrmIoctl::PrimeHandleToFd: @@ -290,8 +288,6 @@ std::string getIoctlString(DrmIoctl ioctlRequest) { return "DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM"; case DrmIoctl::Query: return "DRM_IOCTL_I915_QUERY"; - case DrmIoctl::GemMmap: - return "DRM_IOCTL_I915_GEM_MMAP"; case DrmIoctl::PrimeFdToHandle: return "DRM_IOCTL_PRIME_FD_TO_HANDLE"; case DrmIoctl::PrimeHandleToFd: diff --git a/shared/test/common/libult/linux/drm_mock.cpp b/shared/test/common/libult/linux/drm_mock.cpp index af459fcfee..a82977d8e5 100644 --- a/shared/test/common/libult/linux/drm_mock.cpp +++ b/shared/test/common/libult/linux/drm_mock.cpp @@ -209,12 +209,6 @@ int DrmMock::ioctl(DrmIoctl request, void *arg) { primeToFdParams->fileDescriptor = outputFd; return 0; } - if (request == DrmIoctl::GemMmap) { - ioctlCount.gemMmap++; - auto mmapArg = static_cast(arg); - mmapArg->addrPtr = reinterpret_cast(lockedPtr); - return 0; - } if (request == DrmIoctl::GemWait) { ioctlCount.gemWait++; receivedGemWait = *static_cast(arg); diff --git a/shared/test/common/libult/linux/drm_mock.h b/shared/test/common/libult/linux/drm_mock.h index 5bbbdefcc7..106b3e13b7 100644 --- a/shared/test/common/libult/linux/drm_mock.h +++ b/shared/test/common/libult/linux/drm_mock.h @@ -229,8 +229,6 @@ class DrmMock : public Drm { //DRM_IOCTL_I915_GEM_USERPTR uint32_t returnHandle = 0; uint64_t gpuMemSize = 3u * MemoryConstants::gigaByte; - //DRM_IOCTL_I915_GEM_MMAP - uint64_t lockedPtr[4]; //DRM_IOCTL_I915_QUERY QueryItem storedQueryItem = {}; //DRM_IOCTL_I915_GEM_WAIT diff --git a/shared/test/common/os_interface/linux/device_command_stream_fixture.cpp b/shared/test/common/os_interface/linux/device_command_stream_fixture.cpp index d963b99c73..2ccb844455 100644 --- a/shared/test/common/os_interface/linux/device_command_stream_fixture.cpp +++ b/shared/test/common/os_interface/linux/device_command_stream_fixture.cpp @@ -22,7 +22,6 @@ void Ioctls::reset() { gemVmCreate = 0; primeFdToHandle = 0; handleToPrimeFd = 0; - gemMmap = 0; gemMmapOffset = 0; gemSetDomain = 0; gemWait = 0; @@ -52,7 +51,6 @@ void DrmMockCustom::testIoctls() { NEO_IOCTL_EXPECT_EQ(gemGetTiling); NEO_IOCTL_EXPECT_EQ(primeFdToHandle); NEO_IOCTL_EXPECT_EQ(handleToPrimeFd); - NEO_IOCTL_EXPECT_EQ(gemMmap); NEO_IOCTL_EXPECT_EQ(gemMmapOffset); NEO_IOCTL_EXPECT_EQ(gemSetDomain); NEO_IOCTL_EXPECT_EQ(gemWait); @@ -123,16 +121,6 @@ int DrmMockCustom::ioctl(DrmIoctl request, void *arg) { handleToPrimeParams->fileDescriptor = outputFd; ioctl_cnt.handleToPrimeFd++; } break; - case DrmIoctl::GemMmap: { - auto mmapParams = static_cast(arg); - mmapHandle = mmapParams->handle; - mmapPad = mmapParams->pad; - mmapOffset = mmapParams->offset; - mmapSize = mmapParams->size; - mmapFlags = mmapParams->flags; - mmapParams->addrPtr = mmapAddrPtr; - ioctl_cnt.gemMmap++; - } break; case DrmIoctl::GemSetDomain: { auto setDomainParams = static_cast(arg); setDomainHandle = setDomainParams->handle; diff --git a/shared/test/common/os_interface/linux/device_command_stream_fixture.h b/shared/test/common/os_interface/linux/device_command_stream_fixture.h index 4aca358939..e761e9a458 100644 --- a/shared/test/common/os_interface/linux/device_command_stream_fixture.h +++ b/shared/test/common/os_interface/linux/device_command_stream_fixture.h @@ -44,7 +44,6 @@ class Ioctls { std::atomic gemVmCreate; std::atomic primeFdToHandle; std::atomic handleToPrimeFd; - std::atomic gemMmap; std::atomic gemMmapOffset; std::atomic gemSetDomain; std::atomic gemWait; @@ -188,13 +187,6 @@ class DrmMockCustom : public Drm { int32_t inputFlags = 0; //DRM_IOCTL_I915_GEM_USERPTR uint32_t returnHandle = 0; - //DRM_IOCTL_I915_GEM_MMAP - uint32_t mmapHandle = 0; - uint32_t mmapPad = 0; - uint64_t mmapOffset = 0; - uint64_t mmapSize = 0; - uint64_t mmapAddrPtr = 0x7F4000001000; - uint64_t mmapFlags = 0; //DRM_IOCTL_I915_GEM_SET_DOMAIN uint32_t setDomainHandle = 0; uint32_t setDomainReadDomains = 0; diff --git a/shared/test/unit_test/os_interface/linux/drm_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_tests.cpp index caacf69138..991298f26a 100644 --- a/shared/test/unit_test/os_interface/linux/drm_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_tests.cpp @@ -1218,7 +1218,6 @@ TEST(DrmWrapperTest, WhenGettingIoctlStringValueThenProperStringIsReturned) { {DrmIoctl::GemContextGetparam, "DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM"}, {DrmIoctl::GemContextSetparam, "DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM"}, {DrmIoctl::Query, "DRM_IOCTL_I915_QUERY"}, - {DrmIoctl::GemMmap, "DRM_IOCTL_I915_GEM_MMAP"}, {DrmIoctl::PrimeFdToHandle, "DRM_IOCTL_PRIME_FD_TO_HANDLE"}, {DrmIoctl::GemVmBind, "PRELIM_DRM_IOCTL_I915_GEM_VM_BIND"}, {DrmIoctl::GemVmUnbind, "PRELIM_DRM_IOCTL_I915_GEM_VM_UNBIND"}, diff --git a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp index 5eda267502..06ddc3b7e0 100644 --- a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp +++ b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp @@ -115,7 +115,6 @@ DG1TEST_F(IoctlHelperTestsDg1, whenGettingIoctlRequestValueThenPropertValueIsRet EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemContextGetparam), static_cast(DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM)); EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemContextSetparam), static_cast(DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM)); EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::Query), static_cast(DRM_IOCTL_I915_QUERY)); - EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemMmap), static_cast(DRM_IOCTL_I915_GEM_MMAP)); EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::PrimeFdToHandle), static_cast(DRM_IOCTL_PRIME_FD_TO_HANDLE)); EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::PrimeHandleToFd), static_cast(DRM_IOCTL_PRIME_HANDLE_TO_FD)); EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemContextCreateExt), static_cast(DRM_IOCTL_I915_GEM_CONTEXT_CREATE_EXT)); diff --git a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp index b2c2abcc0f..98fa877b32 100644 --- a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp +++ b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp @@ -38,7 +38,6 @@ TEST_F(IoctlPrelimHelperTests, whenGettingIoctlRequestValueThenPropertValueIsRet EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemContextGetparam), static_cast(DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM)); EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemContextSetparam), static_cast(DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM)); EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::Query), static_cast(DRM_IOCTL_I915_QUERY)); - EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemMmap), static_cast(DRM_IOCTL_I915_GEM_MMAP)); EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::PrimeFdToHandle), static_cast(DRM_IOCTL_PRIME_FD_TO_HANDLE)); EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::PrimeHandleToFd), static_cast(DRM_IOCTL_PRIME_HANDLE_TO_FD)); EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemVmBind), static_cast(PRELIM_DRM_IOCTL_I915_GEM_VM_BIND)); diff --git a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp index 75df6b9c0c..d1086e84cc 100644 --- a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp +++ b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp @@ -39,7 +39,6 @@ TEST(IoctlHelperUpstreamTest, whenGettingIoctlRequestValueThenPropertValueIsRetu EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemContextGetparam), static_cast(DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM)); EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemContextSetparam), static_cast(DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM)); EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::Query), static_cast(DRM_IOCTL_I915_QUERY)); - EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemMmap), static_cast(DRM_IOCTL_I915_GEM_MMAP)); EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::PrimeFdToHandle), static_cast(DRM_IOCTL_PRIME_FD_TO_HANDLE)); EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::PrimeHandleToFd), static_cast(DRM_IOCTL_PRIME_HANDLE_TO_FD)); EXPECT_EQ(ioctlHelper.getIoctlRequestValue(DrmIoctl::GemCreateExt), static_cast(DRM_IOCTL_I915_GEM_CREATE_EXT));