drm/pcids: Split PTL pciids group to make wcl subplatform

[ Upstream commit 6eb2e056b0e418718fc5a3cfe79bdb41d9a2851d ]

To form the WCL platform as a subplatform of PTL in definition,
WCL pci ids are splited into saparate group from PTL.
So update the pciidlist struct to cover all the pci ids.

v2:
- Squash wcl description in single patch for display and xe.(jani,gustavo)

Fixes: 3c0f211bc8fc ("drm/xe: Add Wildcat Lake device IDs to PTL list")
Signed-off-by: Dnyaneshwar Bhadane <dnyaneshwar.bhadane@intel.com>
Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Link: https://lore.kernel.org/r/20250922150317.2334680-2-dnyaneshwar.bhadane@intel.com
(cherry picked from commit 32620e176443bf23ec81bfe8f177c6721a904864)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
[Rodrigo added the Fixes tag when porting it to fixes]
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c
index 089cffabbad57b64f36170494e59aac4f2f4a686..9023c15f3645d40fe73b99df7199471dda24a5fc 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_device.c
+++ b/drivers/gpu/drm/i915/display/intel_display_device.c
@@ -1469,6 +1469,7 @@ static const struct {
        INTEL_LNL_IDS(INTEL_DISPLAY_DEVICE, &lnl_desc),
        INTEL_BMG_IDS(INTEL_DISPLAY_DEVICE, &bmg_desc),
        INTEL_PTL_IDS(INTEL_DISPLAY_DEVICE, &ptl_desc),
+       INTEL_WCL_IDS(INTEL_DISPLAY_DEVICE, &ptl_desc),
 };
 
 static const struct {

diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
index 6c2637fc8f1abd9ad8fa55e7d927de6677e03325..47236457e6a3b19e188befdf330655844a3b1072 100644 (file)
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@ -367,6 +367,7 @@ static const struct pci_device_id pciidlist[] = {
        INTEL_LNL_IDS(INTEL_VGA_DEVICE, &lnl_desc),
        INTEL_BMG_IDS(INTEL_VGA_DEVICE, &bmg_desc),
        INTEL_PTL_IDS(INTEL_VGA_DEVICE, &ptl_desc),
+       INTEL_WCL_IDS(INTEL_VGA_DEVICE, &ptl_desc),
        { }
 };
 MODULE_DEVICE_TABLE(pci, pciidlist);

diff --git a/include/drm/intel/pciids.h b/include/drm/intel/pciids.h
index 76f8d26f9cc9d533fe5496bc6f120e56e1154e8a..97fde8356fb2343e7e57721e3d12476854e069db 100644 (file)
--- a/include/drm/intel/pciids.h
+++ b/include/drm/intel/pciids.h
@@ -872,7 +872,10 @@
        MACRO__(0xB08F, ## __VA_ARGS__), \
        MACRO__(0xB090, ## __VA_ARGS__), \
        MACRO__(0xB0A0, ## __VA_ARGS__), \
-       MACRO__(0xB0B0, ## __VA_ARGS__), \
+       MACRO__(0xB0B0, ## __VA_ARGS__)
+
+/* WCL */
+#define INTEL_WCL_IDS(MACRO__, ...) \
        MACRO__(0xFD80, ## __VA_ARGS__), \
        MACRO__(0xFD81, ## __VA_ARGS__)