commit 2ca9a52e39ac329202dd10e21ccf0859c4369a04
author Casey Bowman <casey.g.bowman@intel.com> Mon Jan 06 16:19:46 2020 -0800
committer Ilja H. Friedel <ihf@chromium.org> Wed Jan 08 04:00:30 2020 +0000
tree 03ac4518f43b6a98f387d1a3b23e664e5d4b9f46
parent 2ae380ae0efbe8befae53b533a34b987c14eb610

autotest: Update update_intel_pci_ids script with WHL and TGL

Some Coffeelake IDs changed to Whiskey Lake since the last time
this script was updated. Tigerlake IDs are also public, so those
IDs have been added as well.

BUG=None
TEST=Run graphics_Idle

Change-Id: Ieee4f5f1a15d51f8579b19de21750e8b1480c8bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/1987816
Reviewed-by: Edward Baker <edward.baker@intel.com>
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
Tested-by: Ilja H. Friedel <ihf@chromium.org>

client/bin/intel_pci_ids.json

diff --git a/client/bin/intel_pci_ids.json b/client/bin/intel_pci_ids.json
index 52de7ed..786340d 100644
--- a/client/bin/intel_pci_ids.json
+++ b/client/bin/intel_pci_ids.json
@@ -137,14 +137,16 @@
     "0x3e93": "coffeelake",
     "0x3e94": "coffeelake",
     "0x3e96": "coffeelake",
+    "0x3e98": "coffeelake",
     "0x3e99": "coffeelake",
     "0x3e9a": "coffeelake",
     "0x3e9b": "coffeelake",
-    "0x3ea0": "coffeelake",
-    "0x3ea1": "coffeelake",
-    "0x3ea2": "coffeelake",
-    "0x3ea3": "coffeelake",
-    "0x3ea4": "coffeelake",
+    "0x3e9c": "coffeelake",
+    "0x3ea0": "whiskeylake",
+    "0x3ea1": "whiskeylake",
+    "0x3ea2": "whiskeylake",
+    "0x3ea3": "whiskeylake",
+    "0x3ea4": "whiskeylake",
     "0x3ea5": "coffeelake",
     "0x3ea6": "coffeelake",
     "0x3ea7": "coffeelake",
@@ -185,14 +187,28 @@
     "0x5a5c": "cannonlake",
     "0x5a84": "broxton",
     "0x5a85": "broxton",
+    "0x87c0": "kabylake",
+    "0x87ca": "coffeelake",
     "0x8a50": "icelake",
     "0x8a51": "icelake",
     "0x8a52": "icelake",
+    "0x8a53": "icelake",
+    "0x8a54": "icelake",
+    "0x8a56": "icelake",
+    "0x8a57": "icelake",
+    "0x8a58": "icelake",
+    "0x8a59": "icelake",
     "0x8a5a": "icelake",
     "0x8a5b": "icelake",
     "0x8a5c": "icelake",
     "0x8a5d": "icelake",
     "0x8a71": "icelake",
+    "0x9a40": "tigerlake",
+    "0x9a49": "tigerlake",
+    "0x9a59": "tigerlake",
+    "0x9a60": "tigerlake",
+    "0x9a68": "tigerlake",
+    "0x9a70": "tigerlake",
     "0x9b21": "cometlake",
     "0x9b41": "cometlake",
     "0x9ba0": "cometlake",
@@ -207,10 +223,13 @@
     "0x9bc2": "cometlake",
     "0x9bc4": "cometlake",
     "0x9bc5": "cometlake",
+    "0x9bc6": "cometlake",
     "0x9bc8": "cometlake",
     "0x9bca": "cometlake",
     "0x9bcb": "cometlake",
     "0x9bcc": "cometlake",
+    "0x9be6": "cometlake",
+    "0x9bf6": "cometlake",
     "0xa001": "pinetrail",
     "0xa011": "pinetrail"
-}
+}
\ No newline at end of file

client/bin/update_intel_pci_ids

diff --git a/client/bin/update_intel_pci_ids b/client/bin/update_intel_pci_ids
index 2beb094..23af5ac 100755
--- a/client/bin/update_intel_pci_ids
+++ b/client/bin/update_intel_pci_ids
@@ -39,7 +39,9 @@
         'Cannonlake': 'cannonlake',
         'Coffeelake': 'coffeelake',
         'Ice Lake': 'icelake',
-        'Comet Lake': 'cometlake'
+        'Comet Lake': 'cometlake',
+        'Whiskey Lake': 'whiskeylake',
+        'TGL': 'tigerlake'
     }
 
     for name in family_name_map:
@@ -52,7 +54,7 @@
     """Extract Intel GPU PCI IDs from Mesa and write to JSON file.
     """
 
-    in_files = ['i915_pci_ids.h', 'i965_pci_ids.h']
+    in_files = ['i915_pci_ids.h', 'i965_pci_ids.h', 'iris_pci_ids.h']
     script_dir = os.path.dirname(os.path.realpath(__file__))
     out_file = os.path.join(script_dir, 'intel_pci_ids.json')
     local_repo = os.path.join(script_dir, '../../../../mesa')
@@ -64,6 +66,9 @@
         chipsets.extend(sp.check_output(cmd + id_file,
                                         shell=True).splitlines())
     for cset in chipsets:
+        # Prevent unexpected lines from being parsed
+        if not 'CHIPSET(' in cset:
+            continue
         cset_attr = cset[len('CHIPSET('):-2].split(',')
 
         # Remove leading and trailing spaces and double quotes.