P4 to Git Change 1228194 by skudchad@skudchad_test_win_opencl2 on 2016/01/15 17:13:28

SWDEV-77172 - Choose isa handle on CZ based on whether SVM is supported or not as SVM may need additional SC Options to be passed as default.

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/9531/diff/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#220 edit

rocclr/runtime/device/gpu/gpuprogram.cpp

@@ -2373,8 +2373,14 @@ 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:
-            return isa.handle == gfx801;
+        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_FIJI_ISA:
         case ED_ATI_CAL_MACHINE_ELLESMERE_ISA:
         case ED_ATI_CAL_MACHINE_BAFFIN_ISA: