Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure GEM_WAIT is not called while bind is available 

Signed-off-by: Lukasz Jobczyk <lukasz.jobczyk@intel.com>
This commit is contained in:
Lukasz Jobczyk 2021-08-16 14:12:33 +00:00 committed by Compute-Runtime-Automation
parent 096373ffe0
commit 2cc11f2199
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_2.cpp
View File

@ -998,7 +998,7 @@ HWTEST_TEMPLATED_F(DrmCommandStreamEnhancedTest,
EXPECT_EQ(1, mock->ioctl_cnt.gemWait); EXPECT_EQ(1, mock->ioctl_cnt.gemWait);
EXPECT_EQ(0u, testedCsr->waitUserFenceResult.called); EXPECT_EQ(0u, testedCsr->waitUserFenceResult.called);
EXPECT_EQ(1u, mock->isVmBindAvailableCall.called); EXPECT_EQ(2u, mock->isVmBindAvailableCall.called);
EXPECT_EQ(0u, mock->waitUserFenceCall.called); EXPECT_EQ(0u, mock->waitUserFenceCall.called);
} }
@ -1022,12 +1022,12 @@ HWTEST_TEMPLATED_F(DrmCommandStreamEnhancedTest,
mock->isVmBindAvailableCall.called = 0u; mock->isVmBindAvailableCall.called = 0u;
FlushStamp handleToWait = 123; FlushStamp handleToWait = 123;
testedCsr->waitForFlushStamp(handleToWait); EXPECT_ANY_THROW(testedCsr->waitForFlushStamp(handleToWait));
EXPECT_EQ(1, mock->ioctl_cnt.gemWait); EXPECT_EQ(0, mock->ioctl_cnt.gemWait);
EXPECT_EQ(0u, testedCsr->waitUserFenceResult.called); EXPECT_EQ(0u, testedCsr->waitUserFenceResult.called);
EXPECT_EQ(1u, mock->isVmBindAvailableCall.called); EXPECT_EQ(2u, mock->isVmBindAvailableCall.called);
EXPECT_EQ(0u, mock->waitUserFenceCall.called); EXPECT_EQ(0u, mock->waitUserFenceCall.called);
} }

2
shared/source/os_interface/linux/drm_neo.cpp
View File

@ -738,6 +738,8 @@ const TopologyMap &Drm::getTopologyMap() {
} }
int Drm::waitHandle(uint32_t waitHandle, int64_t timeout) { int Drm::waitHandle(uint32_t waitHandle, int64_t timeout) {
UNRECOVERABLE_IF(isVmBindAvailable());
drm_i915_gem_wait wait = {}; drm_i915_gem_wait wait = {};
wait.bo_handle = waitHandle; wait.bo_handle = waitHandle;
wait.timeout_ns = timeout; wait.timeout_ns = timeout;