From f87fd87d539b76b7ed887cb25e8fdd74cd32a014 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Tue, 28 May 2024 13:45:14 -0700 Subject: [PATCH] intel/dev: Enable BMG PCI IDs (without INTEL_FORCE_PROBE) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tested with upstream drm-next kernel: commit 6d0ebb3904853d18eeec7af5e8b4ca351b6f9025 Merge: 8bdb468dd7a5 b5d4657e192b Author: Dave Airlie Merge tag 'drm-intel-next-2024-08-29' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next Ref: drm-next 3adcf970dc7e ("drm/xe/bmg: Drop force_probe requirement") Backport-to: 24.2 Signed-off-by: Jordan Justen Reviewed-by: José Roberto de Souza Part-of: (cherry picked from commit e32989a698a78560c3bce935d6bf1feecd267c91) --- .pick_status.json | 2 +- include/pci_ids/iris_pci_ids.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 383f7761a36..d46c78c1571 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1334,7 +1334,7 @@ "description": "intel/dev: Enable BMG PCI IDs (without INTEL_FORCE_PROBE)", "nominated": true, "nomination_type": 4, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/include/pci_ids/iris_pci_ids.h b/include/pci_ids/iris_pci_ids.h index f2aba2ecc19..e5fec06b184 100644 --- a/include/pci_ids/iris_pci_ids.h +++ b/include/pci_ids/iris_pci_ids.h @@ -272,8 +272,8 @@ CHIPSET(0x7d51, arl_h, "ARL", "Intel(R) Graphics") CHIPSET(0x7d67, arl_u, "ARL", "Intel(R) Graphics") CHIPSET(0x7dd1, arl_h, "ARL", "Intel(R) Graphics") -CHIPSET(0xe202, bmg, "BMG G21", "Intel(R) Graphics", FORCE_PROBE) -CHIPSET(0xe20b, bmg, "BMG G21", "Intel(R) Graphics", FORCE_PROBE) -CHIPSET(0xe20c, bmg, "BMG G21", "Intel(R) Graphics", FORCE_PROBE) -CHIPSET(0xe20d, bmg, "BMG G21", "Intel(R) Graphics", FORCE_PROBE) -CHIPSET(0xe212, bmg, "BMG G21", "Intel(R) Graphics", FORCE_PROBE) +CHIPSET(0xe202, bmg, "BMG G21", "Intel(R) Graphics") +CHIPSET(0xe20b, bmg, "BMG G21", "Intel(R) Graphics") +CHIPSET(0xe20c, bmg, "BMG G21", "Intel(R) Graphics") +CHIPSET(0xe20d, bmg, "BMG G21", "Intel(R) Graphics") +CHIPSET(0xe212, bmg, "BMG G21", "Intel(R) Graphics")