Revert "Revert "Merge branch 'amd-master-next' into amd-npi-next""

This reverts commit 374ead1d19.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I92ceb171e31026ed1864704cef2fc1497b883ef9

tests/src/p2p/hipPeerToPeer_simple.cpp

@@ -395,6 +395,9 @@ int main(int argc, char* argv[]) {
 
     if (gpuCount < 2) {
         printf("P2P application requires atleast 2 gpu devices\n");
+        if (hip_skip_tests_enabled()) {
+          return hip_skip_retcode();
+        }
     } else {
         if (p_tests & 0x100) {
             testPeerHostToDevice(false /*useAsyncCopy*/);