Device ID/family corrections for gfx9xx

Change-Id: Icb25fbbaeb99ce886a2852b48d02875ee0f197a2

runtime/hsa-runtime/core/runtime/isa.cpp

@@ -204,6 +204,10 @@ const IsaRegistry::IsaMap IsaRegistry::GetSupportedIsas() {
   ISAREG_ENTRY_GEN(9, 0, 1)
   ISAREG_ENTRY_GEN(9, 0, 2)
   ISAREG_ENTRY_GEN(9, 0, 3)
+  ISAREG_ENTRY_GEN(9, 0, 4)
+  ISAREG_ENTRY_GEN(9, 0, 5)
+  ISAREG_ENTRY_GEN(9, 0, 6)
+  ISAREG_ENTRY_GEN(9, 0, 7)
 
   return supported_isas;
 }

runtime/hsa-runtime/loader/loaders.cpp

@@ -90,11 +90,11 @@ namespace loader {
 #if defined(GFX9_BUILD)
     gfx900.handle = 900;
     gfx901.handle = 901;
-    gfx901.handle = 902;
+    gfx902.handle = 902;
     gfx903.handle = 903;
-    gfx903.handle = 904;
-    gfx903.handle = 905;
-    gfx903.handle = 906;
+    gfx904.handle = 904;
+    gfx905.handle = 905;
+    gfx906.handle = 906;
     gfx907.handle = 907;
 #endif // GFX9_BUILD
   }