diff --git a/src/dawn/gpu_info.json b/src/dawn/gpu_info.json
index 18bdc0b..80436b2 100644
--- a/src/dawn/gpu_info.json
+++ b/src/dawn/gpu_info.json
@@ -104,7 +104,7 @@
           "GCN 1": ["0x6600", "0x6610", "0x6660", "0x6790", "0x6800", "0x6810", "0x6820", "0x6830"],
           "GCN 2": ["0x6640", "0x6650", "0x67A0", "0x67B0", "0x9830", "0x9850"],
           "GCN 3": ["0x6900", "0x6920", "0x6930", "0x7300", "0x9870", "0x98E0"],
-          "GCN 4": ["0x67C0", "0x67D0", "0x67E0", "0x67F0", "0x6980", "0x6990"],
+          "GCN 4": ["0x67C0", "0x67D0", "0x67E0", "0x67F0", "0x6980", "0x6990", "0x6FD0"],
           "GCN 5": ["0x66A0", "0x6860", "0x6870", "0x6940", "0x69A0"],
           "RDNA 1": ["0x7310", "0x7340", "0x7360"],
           "RDNA 2": ["0x73A0", "0x73B0", "0x73D0", "0x73E0", "0x73F0"]
@@ -138,7 +138,7 @@
 
           "Midgard": ["0x00000000"],
           "Bifrost": ["0x60000000", "0x70000000"],
-          "Valhall": ["0x90000000", "0xA0000000"]
+          "Valhall": ["0x90000000", "0xA0000000", "0xB0000000"]
         }
       }]
     },
@@ -166,7 +166,7 @@
           "Gen 7": ["0x0100", "0x0400", "0x0A00", "0x0D00", "0x0F00"],
           "Gen 8": ["0x1600", "0x2200"],
           "Gen 9": ["0x1900", "0x3100", "0x3E00", "0x5A00", "0x5900", "0x9B00"],
-          "Gen 11": ["0x8A00"],
+          "Gen 11": ["0x8A00", "0x4E00"],
           "Gen 12 LP": ["0x4600", "0x4C00", "0x4900", "0x9A00", "0xA700"],
           "Gen 12 HP": ["0x4F00", "0x5600"]
         }
@@ -174,7 +174,12 @@
     },
 
     "Mesa": {
-      "id": "0x10005"
+      "id": "0x10005",
+      "devices": [{
+        "architecture": {
+          "Software": ["0x0000"]
+        }
+      }]
     },
 
     "Microsoft": {
@@ -191,14 +196,24 @@
       "id": "0x10DE",
 
       "devices": [{
-        "mask": "0xFF00",
+        "_comment": "Desktop/laptop devices",
+        "mask": "0xFFFFFF00",
         "architecture": {
           "Fermi": ["0x0D00"],
           "Kepler": ["0x0F00", "0x1000", "0x1100", "0x1200"],
           "Maxwell": ["0x1300", "0x1400", "0x1600", "0x1700"],
           "Pascal": ["0x1500", "0x1B00", "0x1C00", "0x1D00"],
           "Turing": ["0x1E00", "0x1F00", "0x2100"],
-          "Ampere": ["0x2200", "0x2400", "0x2500"]
+          "Ampere": ["0x2200", "0x2400", "0x2500"],
+          "Lovelace": ["0x2600", "0x2700", "0x2800"]
+        }
+      }, {
+        "_comment": "Mobile devices (Tegra)",
+        "mask": "0xFF000000",
+        "architecture": {
+          "Kepler": ["0x1e000000"],
+          "Maxwell": ["0x92000000"],
+          "Pascal": ["0x93000000"]
         }
       }]
     },
@@ -212,7 +227,7 @@
           "Adreno 4xx": ["0x04000000"],
           "Adreno 5xx": ["0x05000000"],
           "Adreno 6xx": ["0x06000000"],
-          "Adreno 7xx": ["0x07000000"]
+          "Adreno 7xx": ["0x07000000", "0x43000000"]
         }
       }]
     },