intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-25 13:33:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: Crash on over memory allocation"

Browse Source 
This reverts commit 212ccb8bd4.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2025-01-24 20:53:43 +01:00
committed by Compute-Runtime-Automation
parent fcb584299f
commit 83af0b77ff
7 changed files with 4 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
shared/source/os_interface/linux/drm_memory_manager.cpp
View File

@@ -1518,17 +1518,8 @@ void *DrmMemoryManager::lockResourceImpl(GraphicsAllocation &graphicsAllocation)
return cpuPtr;
}
auto rootDeviceIndex = graphicsAllocation.getRootDeviceIndex();
auto ioctlHelper = this->getDrm(rootDeviceIndex).getIoctlHelper();
if (ioctlHelper->makeResidentBeforeLockNeeded()) {
auto memoryOperationsInterface = static_cast<DrmMemoryOperationsHandler *>(executionEnvironment.rootDeviceEnvironments[rootDeviceIndex]->memoryOperationsInterface.get());
auto graphicsAllocationPtr = &graphicsAllocation;
[[maybe_unused]] auto ret = memoryOperationsInterface->makeResidentWithinOsContext(getDefaultOsContext(rootDeviceIndex), ArrayRef<NEO::GraphicsAllocation *>(&graphicsAllocationPtr, 1), false) == MemoryOperationsStatus::success;
DEBUG_BREAK_IF(!ret);
}
auto bo = static_cast<DrmAllocation &>(graphicsAllocation).getBO();
if (graphicsAllocation.getAllocationType() == AllocationType::writeCombined) {
auto addr = lockBufferObject(bo);
auto alignedAddr = alignUp(addr, MemoryConstants::pageSize64k);

2
shared/source/os_interface/linux/ioctl_helper.h
View File

@@ -236,8 +236,6 @@ class IoctlHelper {
virtual bool isTimestampsRefreshEnabled() { return false; }
virtual bool makeResidentBeforeLockNeeded() { return false; }
protected:
Drm &drm;
ExternalCtx *externalCtx = nullptr;

2
shared/source/os_interface/linux/xe/ioctl_helper_xe.cpp
View File

@@ -665,7 +665,6 @@ int IoctlHelperXe::createGemExt(const MemRegionsVec &memClassInstances, size_t a
}
create.placement = static_cast<uint32_t>(memoryInstances.to_ulong());
create.cpu_caching = this->getCpuCachingMode(isCoherent, isSysMemOnly);
create.flags |= DRM_XE_GEM_CREATE_FLAG_DEFER_BACKING;
printDebugString(debugManager.flags.PrintBOCreateDestroyResult.get(), stdout, "Performing DRM_IOCTL_XE_GEM_CREATE with {vmid=0x%x size=0x%lx flags=0x%x placement=0x%x caching=%hu }",
create.vm_id, create.size, create.flags, create.placement, create.cpu_caching);
@@ -708,7 +707,6 @@ uint32_t IoctlHelperXe::createGem(uint64_t size, uint32_t memoryBanks, std::opti
}
create.placement = static_cast<uint32_t>(memoryInstances.to_ulong());
create.cpu_caching = this->getCpuCachingMode(isCoherent, isSysMemOnly);
create.flags |= DRM_XE_GEM_CREATE_FLAG_DEFER_BACKING;
printDebugString(debugManager.flags.PrintBOCreateDestroyResult.get(), stdout, "Performing DRM_IOCTL_XE_GEM_CREATE with {vmid=0x%x size=0x%lx flags=0x%x placement=0x%x caching=%hu }",
create.vm_id, create.size, create.flags, create.placement, create.cpu_caching);

1
shared/source/os_interface/linux/xe/ioctl_helper_xe.h
View File

@@ -136,7 +136,6 @@ class IoctlHelperXe : public IoctlHelper {
int getTileIdFromGtId(int gtId) const override {
return gtIdToTileId[gtId];
}
bool makeResidentBeforeLockNeeded() override { return true; }
protected:
static constexpr uint32_t maxContextSetProperties = 4;