diff --git a/opencl/test/unit_test/device/sub_device_tests.cpp b/opencl/test/unit_test/device/sub_device_tests.cpp index d36c2b9fa9..4ec7248ef4 100644 --- a/opencl/test/unit_test/device/sub_device_tests.cpp +++ b/opencl/test/unit_test/device/sub_device_tests.cpp @@ -261,4 +261,12 @@ TEST(SubDevicesTest, givenRootDeviceWithSubDevicesWhenGettingGlobalMemorySizeThe for (const auto &subDevice : deviceFactory.subDevices) { EXPECT_EQ(expectedGlobalMemorySize, static_cast(subDevice)->getGlobalMemorySize()); } +} + +TEST(SubDevicesTest, whenInitializeRootCsrThenDirectSubmissionIsNotInitialized) { + auto device = std::make_unique(); + device->initializeRootCommandStreamReceiver(); + + auto csr = device->getEngine(1u).commandStreamReceiver; + EXPECT_FALSE(csr->isDirectSubmissionEnabled()); } \ No newline at end of file diff --git a/shared/source/device/root_device.cpp b/shared/source/device/root_device.cpp index 29250bb895..bcb5d22eca 100644 --- a/shared/source/device/root_device.cpp +++ b/shared/source/device/root_device.cpp @@ -106,8 +106,6 @@ void RootDevice::initializeRootCommandStreamReceiver() { rootCommandStreamReceiver->setupContext(*osContext); rootCommandStreamReceiver->initializeTagAllocation(); rootCommandStreamReceiver->createGlobalFenceAllocation(); - bool ret = rootCommandStreamReceiver->initDirectSubmission(*this, *osContext); - UNRECOVERABLE_IF(!ret); commandStreamReceivers.push_back(std::move(rootCommandStreamReceiver)); engines.emplace_back(commandStreamReceivers.back().get(), osContext); } diff --git a/shared/test/unit_test/mocks/mock_device.h b/shared/test/unit_test/mocks/mock_device.h index c399313be3..7927b4f224 100644 --- a/shared/test/unit_test/mocks/mock_device.h +++ b/shared/test/unit_test/mocks/mock_device.h @@ -48,6 +48,7 @@ class MockDevice : public RootDevice { using RootDevice::createEngines; using RootDevice::defaultEngineIndex; using RootDevice::getDeviceBitfield; + using RootDevice::initializeRootCommandStreamReceiver; using RootDevice::subdevices; void setOSTime(OSTime *osTime);