Mesa (staging/21.2): intel: remove 2 preproduction pci-id for ADLS

[GitLab Mirror]

Module: Mesa
Branch: staging/21.2
Commit: c5cd5bf877fffc13f5a65424d5231f5ad59b74af
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c5cd5bf877fffc13f5a65424d5231f5ad59b74af

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Fri Oct 22 10:52:50 2021 +0300

intel: remove 2 preproduction pci-id for ADLS

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Fixes: d399c3e861a7c4 ("intel/dev: Add device info for ADL-S")
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13476>
(cherry picked from commit 3b1a5b8f2ba15dfec24b80fcb3f005084c03289e)

---

 .pick_status.json              | 2 +-
 include/pci_ids/iris_pci_ids.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index e6110197eca..26f46e7262f 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -85,7 +85,7 @@
         "description": "intel: remove 2 preproduction pci-id for ADLS",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "d399c3e861a7c459501413e8d675db8ca1a40712"
     },
diff --git a/include/pci_ids/iris_pci_ids.h b/include/pci_ids/iris_pci_ids.h
index 1e8c433b491..956fc23277b 100644
--- a/include/pci_ids/iris_pci_ids.h
+++ b/include/pci_ids/iris_pci_ids.h
@@ -14,8 +14,6 @@ CHIPSET(0x4690, adl_gt1, "ADL-S GT1", "Intel(R) Graphics")
 CHIPSET(0x4691, adl_gt1, "ADL-S GT1", "Intel(R) Graphics")
 CHIPSET(0x4692, adl_gt1, "ADL-S GT1", "Intel(R) Graphics")
 CHIPSET(0x4693, adl_gt05, "ADL-S GT0.5", "Intel(R) Graphics")
-CHIPSET(0x4698, adl_gt1, "ADL-S GT1", "Intel(R) Graphics")
-CHIPSET(0x4699, adl_gt1, "ADL-S GT1", "Intel(R) Graphics")
 
 CHIPSET(0x4626, adl_gt2, "ADL GT2", "Intel(R) Graphics")
 CHIPSET(0x4628, adl_gt2, "ADL GT2", "Intel(R) Graphics")