Module: Mesa Branch: staging/22.2 Commit: 314d56e9b823fa561a01e7fb1f7a83b16387bae8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=314d56e9b823fa561a01e7fb1f7a83b16387bae8
Author: Jordan Justen <[email protected]> Date: Thu Sep 1 23:51:38 2022 -0700 intel/pci_ids: Drop non-upstream dg2 pci-ids These pci-ids should be included in https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14523, since these pci-ids will only be supported by kernels that support the forked Linux uapi. (Note that !14523 will never be merged into upstream Mesa.) Ref: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/drm/i915_pciids.h?h=v6.0-rc3#n695 Fixes: 398a9be94b4 ("intel/dev: Enable remaining DG2 and ATS-M device IDs") Signed-off-by: Jordan Justen <[email protected]> Reviewed-by: Lionel Landwerlin <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18386> (cherry picked from commit b26980a4d40a9c04666d9ef1299c7c037cf15ede) --- .pick_status.json | 2 +- include/pci_ids/iris_pci_ids.h | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index ec4539651a8..fc8bdfe7f1c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3388,7 +3388,7 @@ "description": "intel/pci_ids: Drop non-upstream dg2 pci-ids", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "398a9be94b44ba1063c41e6aa6558a05d797d876" }, diff --git a/include/pci_ids/iris_pci_ids.h b/include/pci_ids/iris_pci_ids.h index a71862f481b..8fdae147fd5 100644 --- a/include/pci_ids/iris_pci_ids.h +++ b/include/pci_ids/iris_pci_ids.h @@ -222,13 +222,6 @@ CHIPSET(0x4907, sg1, "SG1", "Intel(R) Graphics") CHIPSET(0x4908, dg1, "DG1", "Intel(R) Graphics") CHIPSET(0x4909, dg1, "DG1", "Intel(R) Graphics") -CHIPSET(0x4f80, dg2_g10, "DG2", "Intel(R) Graphics") -CHIPSET(0x4f81, dg2_g10, "DG2", "Intel(R) Graphics") -CHIPSET(0x4f82, dg2_g10, "DG2", "Intel(R) Graphics") -CHIPSET(0x4f83, dg2_g10, "DG2", "Intel(R) Graphics") -CHIPSET(0x4f84, dg2_g10, "DG2", "Intel(R) Graphics") -CHIPSET(0x4f87, dg2_g11, "DG2", "Intel(R) Graphics") -CHIPSET(0x4f88, dg2_g11, "DG2", "Intel(R) Graphics") CHIPSET(0x5690, dg2_g10, "DG2", "Intel(R) Arc(tm) A770M Graphics") CHIPSET(0x5691, dg2_g10, "DG2", "Intel(R) Arc(tm) A730M Graphics") CHIPSET(0x5692, dg2_g10, "DG2", "Intel(R) Arc(tm) A550M Graphics")
