P4 to Git Change 1720088 by gandryey@gera-w8 on 2018/12/13 14:29:40
SWDEV-162389 - Switch to dynamic COMGR load Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#181 edit ... //depot/stg/opencl/drivers/opencl/opencldefs#240 edit ... //depot/stg/opencl/drivers/opencl/runtime/build/Makefile.runtime#78 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/comgrctx.cpp#1 add ... //depot/stg/opencl/drivers/opencl/runtime/device/comgrctx.hpp#1 add ... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#239 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#328 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.cpp#16 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.hpp#11 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#21 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.hpp#13 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#119 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#104 edit
This commit is contained in:
@@ -266,6 +266,11 @@ bool NullDevice::create(Pal::AsicRevision asicRevision, Pal::GfxIpLevel ipLevel,
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!ValidateComgr()) {
|
||||
LogError("Code object manager initialization failed!");
|
||||
return false;
|
||||
}
|
||||
|
||||
// Fill the device info structure
|
||||
fillDeviceInfo(properties, heaps, 4096, 1, 0);
|
||||
|
||||
@@ -891,6 +896,12 @@ bool Device::create(Pal::IDevice* device) {
|
||||
!gpuSettings->create(properties(), heaps_, wscaps, appProfile_.reportAsOCL12Device())) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!ValidateComgr()) {
|
||||
LogError("Code object manager initialization failed!");
|
||||
return false;
|
||||
}
|
||||
|
||||
numComputeEngines_ = std::min(numComputeEngines_, settings().numComputeRings_);
|
||||
|
||||
amd::Context::Info info = {0};
|
||||
|
||||
Reference in New Issue
Block a user