SWDEV-377991 - Remove Liquidflash extension
Initial check-in to untie dependencies with HIP and OCL repos
Change-Id: I363b63954c3f118f40a6ed893545d6a4ac44144c
[ROCm/clr commit: c8927cd84e]
This commit is contained in:
zatwierdzone przez
German Andryeyev
rodzic
ebefe9c576
commit
2143e64c23
@@ -440,14 +440,6 @@ bool Settings::create(const Pal::DeviceProperties& palProp,
|
||||
// Enable some platform extensions
|
||||
enableExtension(ClAmdDeviceAttributeQuery);
|
||||
|
||||
|
||||
#ifdef ATI_OS_LINUX
|
||||
if (palProp.gpuMemoryProperties.busAddressableMemSize > 0)
|
||||
#endif
|
||||
{
|
||||
enableExtension(ClAMDLiquidFlash);
|
||||
}
|
||||
|
||||
if (hwLDSSize_ == 0) {
|
||||
// Use hardcoded values for now, since PAL properties aren't available with offline devices
|
||||
hwLDSSize_ = (IS_LINUX || amd::IS_HIP || gfx10Plus_) ? 64 * Ki: 32 * Ki;
|
||||
|
||||
@@ -3755,11 +3755,6 @@ void VirtualGPU::submitTransferBufferFromFile(amd::TransferBufferFileCommand& cm
|
||||
size_t dstSize = amd::TransferBufferFileCommand::StagingBufferSize;
|
||||
dstSize = std::min(dstSize, copySize);
|
||||
void* dstBuffer = staging->cpuMap(*this);
|
||||
if (!cmd.file()->transferBlock(writeBuffer, dstBuffer, staging->size(), fileOffset, 0,
|
||||
dstSize)) {
|
||||
cmd.setStatus(CL_INVALID_OPERATION);
|
||||
return;
|
||||
}
|
||||
staging->cpuUnmap(*this);
|
||||
|
||||
blitMgr().copyBuffer(*staging, *mem, 0, dstOffset, dstSize, false);
|
||||
@@ -3777,11 +3772,6 @@ void VirtualGPU::submitTransferBufferFromFile(amd::TransferBufferFileCommand& cm
|
||||
blitMgr().copyBuffer(*mem, *staging, srcOffset, 0, srcSize, false);
|
||||
|
||||
void* srcBuffer = staging->cpuMap(*this);
|
||||
if (!cmd.file()->transferBlock(writeBuffer, srcBuffer, staging->size(), fileOffset, 0,
|
||||
srcSize)) {
|
||||
cmd.setStatus(CL_INVALID_OPERATION);
|
||||
return;
|
||||
}
|
||||
staging->cpuUnmap(*this);
|
||||
|
||||
fileOffset += srcSize;
|
||||
|
||||
@@ -695,7 +695,6 @@ bool Device::create() {
|
||||
info_.deviceTopology_.pcie.function);
|
||||
if (pro_device_ != nullptr) {
|
||||
pro_ena_ = true;
|
||||
settings_->enableExtension(ClAMDLiquidFlash);
|
||||
pro_device_->GetAsicIdAndRevisionId(&info_.pcieDeviceId_, &info_.pcieRevisionId_);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -3374,11 +3374,7 @@ void VirtualGPU::submitTransferBufferFromFile(amd::TransferBufferFileCommand& cm
|
||||
size_t dstSize = amd::TransferBufferFileCommand::StagingBufferSize;
|
||||
dstSize = std::min(dstSize, copySize);
|
||||
void* dstBuffer = staging->cpuMap(*this);
|
||||
if (!cmd.file()->transferBlock(writeBuffer, dstBuffer, staging->size(), fileOffset, 0,
|
||||
dstSize)) {
|
||||
cmd.setStatus(CL_INVALID_OPERATION);
|
||||
return;
|
||||
}
|
||||
|
||||
staging->cpuUnmap(*this);
|
||||
|
||||
bool result = blitMgr().copyBuffer(*staging, *mem, 0, dstOffset, dstSize, false);
|
||||
@@ -3395,11 +3391,7 @@ void VirtualGPU::submitTransferBufferFromFile(amd::TransferBufferFileCommand& cm
|
||||
bool result = blitMgr().copyBuffer(*mem, *staging, srcOffset, 0, srcSize, false);
|
||||
|
||||
void* srcBuffer = staging->cpuMap(*this);
|
||||
if (!cmd.file()->transferBlock(writeBuffer, srcBuffer, staging->size(), fileOffset, 0,
|
||||
srcSize)) {
|
||||
cmd.setStatus(CL_INVALID_OPERATION);
|
||||
return;
|
||||
}
|
||||
|
||||
staging->cpuUnmap(*this);
|
||||
|
||||
fileOffset += srcSize;
|
||||
|
||||
@@ -751,11 +751,6 @@ void TransferBufferFileCommand::submit(device::VirtualDevice& device) {
|
||||
}
|
||||
// Make HD transfer to the host accessible memory
|
||||
bool writeBuffer(type() == CL_COMMAND_READ_SSG_FILE_AMD);
|
||||
if (!file()->transferBlock(writeBuffer, srcDstBuffer, mem->size(), fileOffset(), origin()[0],
|
||||
size()[0])) {
|
||||
setStatus(CL_INVALID_OPERATION);
|
||||
return;
|
||||
}
|
||||
if (memory_->getMemFlags() & CL_MEM_USE_PERSISTENT_MEM_AMD) {
|
||||
// Lock protected multiple maps for persistent memory
|
||||
amd::ScopedLock lock(mem->owner()->lockMemoryOps());
|
||||
|
||||
Reference in New Issue
Block a user