From 196ea99520ea57ec70d771e78c83293545fbb373 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Fri, 12 May 2023 21:57:17 +1000 Subject: [PATCH] intel/dev: remove dg2 0x5698 pci id MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 0x5698 is now reserved for future use From Matt Roper in linux 3a38be31ec82 ("drm/i915/dg2: Drop one PCI ID") Fixes: 65c9a810eed ("intel/pci_ids: Add dg2 0x5698 pci-id") Acked-by: Lionel Landwerlin Reviewed-by: José Roberto de Souza Part-of: (cherry picked from commit af0f7b347513c8fdb325d45640c1d36a14fe9b3a) --- .pick_status.json | 2 +- include/pci_ids/iris_pci_ids.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index bb45e13ce1330..ad679816a30b5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1615,7 +1615,7 @@ "description": "intel/dev: remove dg2 0x5698 pci id", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "65c9a810eedc7bacd91fac558d9a7b0ab6d76459" }, diff --git a/include/pci_ids/iris_pci_ids.h b/include/pci_ids/iris_pci_ids.h index da37b5689df86..7b95cd87da332 100644 --- a/include/pci_ids/iris_pci_ids.h +++ b/include/pci_ids/iris_pci_ids.h @@ -230,7 +230,6 @@ CHIPSET(0x5694, dg2_g11, "DG2", "Intel(R) Arc(tm) A350M Graphics") CHIPSET(0x5695, dg2_g11, "DG2", "Intel(R) Graphics") CHIPSET(0x5696, dg2_g12, "DG2", "Intel(R) Graphics") CHIPSET(0x5697, dg2_g12, "DG2", "Intel(R) Graphics") -CHIPSET(0x5698, dg2_g11, "DG2", "Intel(R) Graphics") CHIPSET(0x56a0, dg2_g10, "DG2", "Intel(R) Arc(tm) A770 Graphics") CHIPSET(0x56a1, dg2_g10, "DG2", "Intel(R) Arc(tm) A750 Graphics") CHIPSET(0x56a2, dg2_g10, "DG2", "Intel(R) Arc(tm) A580 Graphics")