Region based apis to pool based api changes

Change-Id: If53019eebafe051ab4e811863995f78315297080

include/hcc_detail/staging_buffer.h

@@ -26,11 +26,11 @@ THE SOFTWARE.
 
 //-------------------------------------------------------------------------------------------------
 // An optimized "staging buffer" used to implement Host-To-Device and Device-To-Host copies.
-// Some GPUs may not be able to directly access host memory, and in these cases we need to 
+// Some GPUs may not be able to directly access host memory, and in these cases we need to
 // stage the copy through a pinned staging buffer.  For example, the CopyHostToDevice
 // uses the CPU to copy to a pinned "staging buffer", and then use the GPU DMA engine to copy
 // from the staging buffer to the final destination.  The copy is broken into buffer-sized chunks
-// to limit the size of the buffer and also to provide better performance by overlapping the CPU copies 
+// to limit the size of the buffer and also to provide better performance by overlapping the CPU copies
 // with the DMA copies.
 //
 // PinInPlace is another algorithm which pins the host memory "in-place", and copies it with the DMA
@@ -41,7 +41,7 @@ struct StagingBuffer {
 
     static const int _max_buffers = 4;
 
-    StagingBuffer(hsa_agent_t hsaAgent, hsa_region_t systemRegion, size_t bufferSize, int numBuffers) ;
+    StagingBuffer(hsa_agent_t hsaAgent,hsa_agent_t cpuAgent, size_t bufferSize, int numBuffers) ;
     ~StagingBuffer();
 
     void CopyHostToDevice(void* dst, const void* src, size_t sizeBytes, hsa_signal_t *waitFor);
@@ -55,13 +55,14 @@ struct StagingBuffer {
 
 private:
     hsa_agent_t     _hsa_agent;
+    hsa_agent_t     _cpu_agent;
     size_t          _bufferSize;  // Size of the buffers.
     int             _numBuffers;
 
     char            *_pinnedStagingBuffer[_max_buffers];
     hsa_signal_t     _completion_signal[_max_buffers];
     hsa_signal_t     _completion_signal2[_max_buffers]; // P2P needs another set of signals.
-    std::mutex       _copy_lock;    // provide thread-safe access 
+    std::mutex       _copy_lock;    // provide thread-safe access
 };
 
 #endif