From 6cc698f89681cb3a01c429ea9ca4fd4476ee6d38 Mon Sep 17 00:00:00 2001 From: Bartosz Dunajski Date: Mon, 4 May 2020 11:12:38 +0200 Subject: [PATCH] Change PrivateDriverDataSize for Wddm 2.3 submits Change-Id: I472aa50f415947dfdb30168219c717dac26abdc8 Signed-off-by: Bartosz Dunajski --- opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp | 2 +- shared/source/os_interface/windows/wddm/wddm_interface.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp index b4bd23363f..733d6fe20f 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp @@ -130,7 +130,7 @@ TEST_F(Wddm23Tests, givenCmdBufferWhenSubmitCalledThenSetAllRequiredFiledsAndUpd EXPECT_EQ(hwQueue.handle, getSubmitCommandToHwQueueDataFcn()->hHwQueue); EXPECT_EQ(osContext->getResidencyController().getMonitoredFence().lastSubmittedFence, getSubmitCommandToHwQueueDataFcn()->HwQueueProgressFenceId); EXPECT_EQ(&cmdBufferHeader, getSubmitCommandToHwQueueDataFcn()->pPrivateDriverData); - EXPECT_EQ(static_cast(MemoryConstants::pageSize), getSubmitCommandToHwQueueDataFcn()->PrivateDriverDataSize); + EXPECT_EQ(static_cast(sizeof(COMMAND_BUFFER_HEADER)), getSubmitCommandToHwQueueDataFcn()->PrivateDriverDataSize); EXPECT_EQ(0u, cmdBufferHeader.MonitorFenceVA); EXPECT_EQ(0u, cmdBufferHeader.MonitorFenceValue); diff --git a/shared/source/os_interface/windows/wddm/wddm_interface.cpp b/shared/source/os_interface/windows/wddm/wddm_interface.cpp index 16b451aa1b..6eb3678c0b 100644 --- a/shared/source/os_interface/windows/wddm/wddm_interface.cpp +++ b/shared/source/os_interface/windows/wddm/wddm_interface.cpp @@ -139,7 +139,7 @@ bool WddmInterface23::submit(uint64_t commandBuffer, size_t size, void *commandH submitCommand.CommandLength = static_cast(size); submitCommand.pPrivateDriverData = commandHeader; - submitCommand.PrivateDriverDataSize = MemoryConstants::pageSize; + submitCommand.PrivateDriverDataSize = sizeof(COMMAND_BUFFER_HEADER); auto status = wddm.getGdi()->submitCommandToHwQueue(&submitCommand); UNRECOVERABLE_IF(status != STATUS_SUCCESS);