intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-21 09:14:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Disable Shared System USM if CPU addr range unacceptable

Browse Source 
Related-To: NEO-15680

Signed-off-by: John Falkowski <john.falkowski@intel.com>
This commit is contained in:
John Falkowski
2025-08-01 06:14:40 +00:00
committed by Compute-Runtime-Automation
parent 9b24ddbe1a
commit a45f47fad1
5 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1684,20 +1684,6 @@ int Drm::unbindBufferObject(OsContext *osContext, uint32_t vmHandleId, BufferObj
return changeBufferObjectBinding(this, osContext, vmHandleId, bo, false, false);
}
uint64_t Drm::getSharedSystemAllocAddressRange() {
/*Setting GPU address larger than actual may lead to crash */
if (debugManager.flags.OverrideGpuAddressSpace.get() != -1) {
this->getRootDeviceEnvironment().getMutableHardwareInfo()->capabilityTable.gpuAddressSpace = maxNBitValue(static_cast<uint64_t>(debugManager.flags.OverrideGpuAddressSpace.get()));
}
/* Use full address range */
uint64_t gpuAddressLength = (this->getRootDeviceEnvironment().getMutableHardwareInfo()->capabilityTable.gpuAddressSpace + 1);
uint64_t cpuAddressLength = (0x1ull << (NEO::CpuInfo::getInstance().getVirtualAddressSize()));
if (cpuAddressLength < gpuAddressLength) {
gpuAddressLength = cpuAddressLength;
}
return gpuAddressLength;
}
int Drm::createDrmVirtualMemory(uint32_t &drmVmId) {
GemVmControl ctl{};
@@ -1922,7 +1908,21 @@ bool Drm::queryDeviceIdAndRevision() {
}
void Drm::adjustSharedSystemMemCapabilities() {
if (!this->isSharedSystemAllocEnabled()) {
if (this->isSharedSystemAllocEnabled()) {
uint64_t gpuAddressLength = (this->getRootDeviceEnvironment().getMutableHardwareInfo()->capabilityTable.gpuAddressSpace + 1);
uint64_t cpuAddressLength = (0x1ull << (NEO::CpuInfo::getInstance().getVirtualAddressSize()));
if ((cpuAddressLength > (maxNBitValue(48) + 1)) && !(CpuInfo::getInstance().isCpuFlagPresent("la57"))) {
cpuAddressLength = (maxNBitValue(48) + 1);
}
if (gpuAddressLength < cpuAddressLength) {
this->setSharedSystemAllocEnable(false);
this->getRootDeviceEnvironment().getMutableHardwareInfo()->capabilityTable.sharedSystemMemCapabilities = 0;
printDebugString(debugManager.flags.PrintDebugMessages.get(), stderr, "%s", "Shared System USM NOT allowed: CPU address range > GPU address range\n");
} else {
this->setSharedSystemAllocAddressRange(cpuAddressLength);
this->setPageFaultSupported(true);
}
} else {
this->getRootDeviceEnvironment().getMutableHardwareInfo()->capabilityTable.sharedSystemMemCapabilities = 0;
}
}