From b12970cbe274b51b59a834a8d5b7c7e9e5e6791a Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Mon, 17 Nov 2014 15:56:59 -0500
Subject: [PATCH] P4 to Git Change 1097741 by efinger@efinger_BDCW7-EFINGER on
 2014/11/17 15:47:10

	EPR #092474 - Fix OpenCL build

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuscsi.cpp#26 edit
---
 rocclr/runtime/device/gpu/gpuscsi.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rocclr/runtime/device/gpu/gpuscsi.cpp b/rocclr/runtime/device/gpu/gpuscsi.cpp
index 6b0ac589c7..d7d2df3cf6 100644
--- a/rocclr/runtime/device/gpu/gpuscsi.cpp
+++ b/rocclr/runtime/device/gpu/gpuscsi.cpp
@@ -8,6 +8,7 @@
 #include "acl.h"
 #include "SCShadersSi.h"
 #include "si_ci_vi_merged_offset.h"
+#include "si_ci_vi_merged_registers.h"
 #include <string>
 #include <fstream>
 #include <sstream>
@@ -112,8 +113,11 @@ NullKernel::siCreateHwInfo(const void* shader, AMUabiAddEncoding& encoding)
     newInfos[i].value = 32*1024;    //options.LDSSize;
     i++;
 
+    COMPUTE_PGM_RSRC2 computePgmRsrc2;
+    computePgmRsrc2.u32All = cShader->computePgmRsrc2.u32All;
+
     newInfos[i].address = AMU_ABI_LDS_SIZE_USED;
-    newInfos[i].value = 64 * 4 * cShader->computePgmRsrc2.bits.LDS_SIZE;
+    newInfos[i].value = 64 * 4 * computePgmRsrc2.bits.LDS_SIZE;
     i++;
 
     infoCount = i;