From 291aacb7643b6e29d6d1aa68f79fdc3b090807ea Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Fri, 5 Aug 2016 12:12:23 -0400
Subject: [PATCH] P4 to Git Change 1299584 by lmoriche@lmoriche_opencl_dev on
 2016/08/05 12:04:07

	SWDEV-94610 - To allow the device initialization to complete, disable the blit kernels creation for now (OpenCL/LC).

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#6 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#6 edit


[ROCm/clr commit: 53e279d2b153ddb3ed768978b8fc3b6c28836a40]
---
 projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp  | 2 ++
 projects/clr/rocclr/runtime/device/rocm/rocvirtual.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp b/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp
index bd168a9669..e850c5ca3e 100644
--- a/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp
+++ b/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp
@@ -436,6 +436,7 @@ Device::create()
         return false;
     }
 
+#if !defined(WITH_LIGHTNING_COMPILER) // FIXME_Wilkin
     blitProgram_ = new BlitProgram(context_);
     // Create blit programs
     if (blitProgram_ == NULL || !blitProgram_->create(this)) {
@@ -444,6 +445,7 @@ Device::create()
         LogError("Couldn't create blit kernels!");
         return false;
     }
+#endif // !defined(WITH_LIGHTNING_COMPILER)
 
     mapCacheOps_ = new amd::Monitor("Map Cache Lock", true);
     if (NULL == mapCacheOps_) {
diff --git a/projects/clr/rocclr/runtime/device/rocm/rocvirtual.cpp b/projects/clr/rocclr/runtime/device/rocm/rocvirtual.cpp
index 91846f08b4..73ad22461c 100644
--- a/projects/clr/rocclr/runtime/device/rocm/rocvirtual.cpp
+++ b/projects/clr/rocclr/runtime/device/rocm/rocvirtual.cpp
@@ -522,12 +522,14 @@ VirtualGPU::create(bool profilingEna)
         return false;
     }
 
+#if !defined(WITH_LIGHTNING_COMPILER) // FIXME_Wilkin
     device::BlitManager::Setup  blitSetup;
     blitMgr_ = new KernelBlitManager(*this, blitSetup);
     if ((NULL == blitMgr_) || !blitMgr_->create(roc_device_)) {
         LogError("Could not create BlitManager!");
         return false;
     }
+#endif // !defined(WITH_LIGHTNING_COMPILER)
 
     // Create signal for the barrier packet.
     hsa_signal_t signal = { 0 };