From ff5bad89bd9adc570512ebadcb9a93cec861deae Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 22 May 2019 17:36:57 -0400 Subject: [PATCH] P4 to Git Change 1786426 by gandryey@gera-win10 on 2019/05/22 16:54:24 SWDEV-79445 - OCL generic changes and code clean-up - Fix a crash when SDMA is disabled Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#137 edit [ROCm/clr commit: bee817ba6c752d7ffffe9f9507f4ae57b28c653d] --- projects/clr/rocclr/runtime/device/pal/paldevice.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp index ae0ba7196e..3011c60b74 100644 --- a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp +++ b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp @@ -927,6 +927,11 @@ bool Device::create(Pal::IDevice* device) { palSettings->disableResourceProcessingManager = true; palSettings->numScratchWavesPerCu = settings().numScratchWavesPerCu_; + if (PAL_DISABLE_SDMA) { + // Make sure CP DMA is used only, since compute path won't work in PAL with OCL + palSettings->cpDmaCmdCopyMemoryMaxBytes = 0xFFFFFFFF; + } + // Commit the new settings for the device result = iDev()->CommitSettingsAndInit();