From 9be20b9fd15de05f45b0f22a1eb6e8d88c8dd7d8 Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Fri, 31 Mar 2017 17:32:40 -0400
Subject: [PATCH] P4 to Git Change 1393470 by asalmanp@asalmanp-opencl-stg on
 2017/03/31 17:25:32

	SWDEV-107075 - removing unused environment variable and code

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/12549/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#20 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.hpp#9 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#269 edit
---
 rocclr/runtime/device/pal/palsettings.cpp | 2 --
 rocclr/runtime/device/pal/palsettings.hpp | 3 +--
 rocclr/runtime/utils/flags.hpp            | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/rocclr/runtime/device/pal/palsettings.cpp b/rocclr/runtime/device/pal/palsettings.cpp
index b6b1b2dabb..0be808b97d 100644
--- a/rocclr/runtime/device/pal/palsettings.cpp
+++ b/rocclr/runtime/device/pal/palsettings.cpp
@@ -135,8 +135,6 @@ Settings::Settings()
     // Disable SDMA workaround by default
     sdamPageFaultWar_ = false;
 
-    // Disable SDMA copy for Image to Mem and Mem to Image by default
-    disableSdmaMemoryToImage_ = false;
 }
 
 bool
diff --git a/rocclr/runtime/device/pal/palsettings.hpp b/rocclr/runtime/device/pal/palsettings.hpp
index a38d0a58d1..9c63b2900d 100644
--- a/rocclr/runtime/device/pal/palsettings.hpp
+++ b/rocclr/runtime/device/pal/palsettings.hpp
@@ -67,8 +67,7 @@ public:
             uint    useDeviceQueue_: 1;     //!< Submit to separate device queue
             uint    singleFpDenorm_: 1;     //!< Support Single FP Denorm
             uint    sdamPageFaultWar_: 1;   //!< SDMA page fault workaround
-            uint    disableSdmaMemoryToImage_ : 1;//!< Disable sDMA copy for Memory to Image
-            uint    reserved_: 8;
+            uint    reserved_: 9;
         };
         uint    value_;
     };
diff --git a/rocclr/runtime/utils/flags.hpp b/rocclr/runtime/utils/flags.hpp
index cbed0e4567..37e35d539e 100644
--- a/rocclr/runtime/utils/flags.hpp
+++ b/rocclr/runtime/utils/flags.hpp
@@ -205,9 +205,6 @@ release(bool, OCL_CODE_CACHE_ENABLE, false,                                   \
         "1 = Enable compiler code cache")                                     \
 release(bool, OCL_CODE_CACHE_RESET, false,                                    \
         "1 =  Reset the compiler code cache storage")                         \
-release(bool, GPU_DISABLE_SDMA_MEMORY_TO_IMAGE, true,                         \
-        "0 = Enable sDMA for Memory to Image and Image to Memory copies")
-
 
 namespace amd {