From 9744df97addd6e793ac8dd989201a5e12b00bb0a Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Mon, 18 May 2015 20:15:12 -0400
Subject: [PATCH] P4 to Git Change 1151968 by
 skudchad@skudchad_test_win_opencl2 on 2015/05/18 20:09:41

	EPR #403782 - IOMMU2/SVM
	- Disable DX interop on SVM. This is a feature for SVM and may need more work.

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

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#310 edit


[ROCm/clr commit: 915592103f8e4e396e85a93e7250c099447b2907]
---
 .../clr/rocclr/runtime/device/gpu/gpusettings.cpp  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp b/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
index 4cdfab71f4..7cf23e23bd 100644
--- a/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
+++ b/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
@@ -398,11 +398,6 @@ Settings::create(
     enableExtension(ClAmdMediaOps);
     enableExtension(ClAmdMediaOps2);
     enableExtension(ClAmdPopcnt);
-#if defined(_WIN32)
-    enableExtension(ClKhrD3d9Sharing);
-    enableExtension(ClKhrD3d10Sharing);
-    enableExtension(ClKhrD3d11Sharing);
-#endif // _WIN32
     enableExtension(ClKhr3DImageWrites);
     enableExtension(ClAmdVec3);
     enableExtension(ClAmdPrintf);
@@ -464,6 +459,15 @@ Settings::create(
 
     enableExtension(ClKhrSpir);
 
+    // SVM is not currently supported for DX Interop
+    if (!svmFineGrainSystem_) {
+#if defined(_WIN32)
+        enableExtension(ClKhrD3d9Sharing);
+        enableExtension(ClKhrD3d10Sharing);
+        enableExtension(ClKhrD3d11Sharing);
+#endif // _WIN32
+    }
+
     // Enable some OpenCL 2.0 extensions
     if (oclVersion_ >= OpenCL20) {
         enableExtension(ClKhrGLDepthImages);