Module: Mesa Branch: staging/21.3 Commit: 314870fcea625fc019e99a83b9a1d4d85c09d6bc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=314870fcea625fc019e99a83b9a1d4d85c09d6bc
Author: Lionel Landwerlin <[email protected]> Date: Fri Oct 22 10:52:50 2021 +0300 intel: remove 2 preproduction pci-id for ADLS Signed-off-by: Lionel Landwerlin <[email protected]> Fixes: d399c3e861a7c4 ("intel/dev: Add device info for ADL-S") Reviewed-by: Jordan Justen <[email protected]> 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 ad4cd59b598..06f2ff2f9c7 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -787,7 +787,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 42f0c701332..c5c2dd5d550 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")
