P4 to Git Change 1210812 by emankov@em-hsa-amd on 2015/11/12 18:22:08

SWDEV-77584 - ORCA RT: Preparations for enabling HSAIL on OpenCL 1.2 by default. Fix for rare regressions with AMDIL on CI+, when forcing AMDIL by -legacy.

	[Testing] Pre-checkin:
	http://ocltc.amd.com:8111/viewModification.html?modId=62184&personal=true&buildTypeId=&tab=vcsModificationBuilds&show_all_builds=true

	[Reviewers] German Andryeyev, Brian Sumner
	http://ocltc.amd.com/reviews/r/8975

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#536 edit

rocclr/runtime/device/gpu/gpudevice.cpp

@@ -566,9 +566,7 @@ Device::Heap::create(Device& device)
         return false;
     }
 
-    if (!device.settings().hsail_) {
-        baseAddress_ = resource_->gslResource()->getSurfaceAddress();
-    }
+    baseAddress_ = resource_->gslResource()->getSurfaceAddress();
     return true;
 }