From 81f54bcdd3521c74db2615e498ea7017d93e41f5 Mon Sep 17 00:00:00 2001
From: Sarbojit Sarkar <sarbojit.sarkar@amd.com>
Date: Wed, 16 Dec 2020 07:02:27 -0500
Subject: [PATCH] SWDEV-262857: minor fix for D2D

Change-Id: Ica3cb9108e7a0d40d6a910f318df0a2420145603


[ROCm/clr commit: 0e4b4255b20ff7bca3c881dbfdb7f411f1954268]
---
 projects/clr/rocclr/platform/command.cpp | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/projects/clr/rocclr/platform/command.cpp b/projects/clr/rocclr/platform/command.cpp
index 0671e0331e..96f72f1c67 100644
--- a/projects/clr/rocclr/platform/command.cpp
+++ b/projects/clr/rocclr/platform/command.cpp
@@ -414,20 +414,17 @@ bool TwoMemoryArgsCommand::validatePeerMemory(){
         dstDevices.size() == 1 &&
         srcDevices[0] != dstDevices[0]) {
       device::Memory* mem1 = memory1_->getDeviceMemory(*srcDevices[0]);
-      if (queue_device != srcDevices[0]) {
-        if (!mem1->getAllowedPeerAccess()) {
-          void* src = reinterpret_cast<void*>(mem1->virtualAddress());
-          accessAllowed = srcDevices[0]->deviceAllowAccess(src);
-          mem1->setAllowedPeerAccess(true);
-        }
+      if (!mem1->getAllowedPeerAccess()) {
+        void* src = reinterpret_cast<void*>(mem1->virtualAddress());
+        accessAllowed = srcDevices[0]->deviceAllowAccess(src);
+        mem1->setAllowedPeerAccess(true);
       }
+
       device::Memory* mem2 = memory2_->getDeviceMemory(*dstDevices[0]);
-      if (queue_device != dstDevices[0] && accessAllowed == true) {
-        if (!mem2->getAllowedPeerAccess()) {
-          void* dst = reinterpret_cast<void*>(mem2->virtualAddress());
-          accessAllowed = dstDevices[0]->deviceAllowAccess(dst);
-          mem2->setAllowedPeerAccess(true);
-        }
+      if (!mem2->getAllowedPeerAccess()) {
+        void* dst = reinterpret_cast<void*>(mem2->virtualAddress());
+        accessAllowed &= dstDevices[0]->deviceAllowAccess(dst);
+        mem2->setAllowedPeerAccess(true);
       }
     }
   }