Merge gfx90a into amd-staging

Conflicts:
	CMakeLists.txt
	include/hsakmt.h
	src/libhsakmt.h
	src/libhsakmt.ver
	src/queues.c
	src/topology.c
	tests/kfdtest/src/KFDMemoryTest.cpp
	tests/kfdtest/src/KFDTestUtil.hpp

Signed-off-by: Kent Russell <kent.russell@amd.com>
Change-Id: Ic2732e7c0b5e42c1a3a91223f65a65064b602181


[ROCm/ROCR-Runtime commit: 83d80074f7]

projects/rocr-runtime/tests/kfdtest/src/KFDCWSRTest.cpp

@@ -198,11 +198,13 @@ TEST_F(KFDCWSRTest, BasicTest) {
         int i;
         for (i = 0 ; i < wave_number; ++i) {
              if (result1[i] != count1) {
-                 LOG() << "Dispatch 1, work item " << i << ' ' << result1[i] << std::endl;
+                 LOG() << "Dispatch 1, work item [" << std::dec << i << "] "
+                         << result1[i] << " != " << count1 << std::endl;
                  break;
              }
              if (result2[i] != count2) {
-                 LOG() << "Dispatch 2, work item " << i << ' ' << result2[i] << std::endl;
+                 LOG() << "Dispatch 2, work item [" << std::dec << i << "] "
+                         << result2[i] << " != " << count2 << std::endl;
                  break;
              }
         }