diff --git a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp index deda7d6812..45d259e64d 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp @@ -806,13 +806,14 @@ HWTEST_F(EnqueueWriteImageTest, whenIsValidForStagingWriteImageCalledThenReturnC if (!svmSupported) { GTEST_SKIP(); } + auto isStagingBuffersEnabled = pDevice->getProductHelper().isStagingBuffersEnabled(); unsigned char ptr[16]; std::unique_ptr image(Image1dHelper<>::create(context)); - EXPECT_FALSE(pCmdQ->isValidForStagingWriteImage(image.get(), ptr, false)); + EXPECT_EQ(isStagingBuffersEnabled, pCmdQ->isValidForStagingWriteImage(image.get(), ptr, false)); image.reset(Image2dHelper<>::create(context)); - EXPECT_FALSE(pCmdQ->isValidForStagingWriteImage(image.get(), ptr, false)); + EXPECT_EQ(isStagingBuffersEnabled, pCmdQ->isValidForStagingWriteImage(image.get(), ptr, false)); image.reset(Image3dHelper<>::create(context)); EXPECT_FALSE(pCmdQ->isValidForStagingWriteImage(image.get(), ptr, false)); diff --git a/shared/source/utilities/staging_buffer_manager.cpp b/shared/source/utilities/staging_buffer_manager.cpp index 3ece30693c..e0951a1735 100644 --- a/shared/source/utilities/staging_buffer_manager.cpp +++ b/shared/source/utilities/staging_buffer_manager.cpp @@ -197,7 +197,7 @@ bool StagingBufferManager::isValidForCopy(const Device &device, void *dstPtr, co } bool StagingBufferManager::isValidForStagingWriteImage(const Device &device, const void *ptr, bool hasDependencies) const { - auto stagingCopyEnabled = false; + auto stagingCopyEnabled = device.getProductHelper().isStagingBuffersEnabled(); if (debugManager.flags.EnableCopyWithStagingBuffers.get() != -1) { stagingCopyEnabled = debugManager.flags.EnableCopyWithStagingBuffers.get(); } diff --git a/shared/test/unit_test/utilities/staging_buffer_manager_tests.cpp b/shared/test/unit_test/utilities/staging_buffer_manager_tests.cpp index e083323b7b..7e6e6c2712 100644 --- a/shared/test/unit_test/utilities/staging_buffer_manager_tests.cpp +++ b/shared/test/unit_test/utilities/staging_buffer_manager_tests.cpp @@ -186,7 +186,8 @@ TEST_F(StagingBufferManagerTest, givenStagingBufferEnabledWhenValidForImageWrite EXPECT_FALSE(stagingBufferManager->isValidForStagingWriteImage(*pDevice, nonUsmBuffer, false)); debugManager.flags.EnableCopyWithStagingBuffers.set(-1); - EXPECT_FALSE(stagingBufferManager->isValidForStagingWriteImage(*pDevice, nonUsmBuffer, false)); + auto isStaingBuffersEnabled = pDevice->getProductHelper().isStagingBuffersEnabled(); + EXPECT_EQ(isStaingBuffersEnabled, stagingBufferManager->isValidForStagingWriteImage(*pDevice, nonUsmBuffer, false)); svmAllocsManager->freeSVMAlloc(usmBuffer); }