From e84d8eb04dd1cd8a13fd3fd77371f0143d8a5f2a Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 15 Jan 2016 22:32:16 -0500 Subject: [PATCH] P4 to Git Change 1228237 by skudchad@skudchad_test_win_opencl2 on 2016/01/15 22:24:47 SWDEV-77172 - Back out changelist 1228194 Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#221 edit --- rocclr/runtime/device/gpu/gpuprogram.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/rocclr/runtime/device/gpu/gpuprogram.cpp b/rocclr/runtime/device/gpu/gpuprogram.cpp index 0597be9d2f..37fc985f45 100644 --- a/rocclr/runtime/device/gpu/gpuprogram.cpp +++ b/rocclr/runtime/device/gpu/gpuprogram.cpp @@ -2373,14 +2373,8 @@ bool ORCAHSALoaderContext::IsaSupportedByAgent(hsa_agent_t agent, hsa_isa_t isa) case ED_ATI_CAL_MACHINE_ICELAND_ISA: case ED_ATI_CAL_MACHINE_TONGA_ISA: return isa.handle == gfx800; - case ED_ATI_CAL_MACHINE_CARRIZO_ISA: { - if (program_->dev().settings().svmFineGrainSystem_) { - return isa.handle == gfx801; - } - else { - return isa.handle == gfx804; - } - } + case ED_ATI_CAL_MACHINE_CARRIZO_ISA: + return isa.handle == gfx801; case ED_ATI_CAL_MACHINE_FIJI_ISA: case ED_ATI_CAL_MACHINE_ELLESMERE_ISA: case ED_ATI_CAL_MACHINE_BAFFIN_ISA: