drm/i915/display: Add MTL subplatforms definition

Separate MTL-U platform PCI ids in one define macro.

Add the MTL U/ARL U as subplatform member in MTL platform description
structure to use display.platform.<platform> from intel_display
structure instead of IS_<PLATFORM>() in display code path.

v2:
- Club ARL-u in MTL and identify ARL-u as MTL-u subplatform(Jani)

Signed-off-by: Dnyaneshwar Bhadane <dnyaneshwar.bhadane@intel.com>
Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241217201301.3593054-2-dnyaneshwar.bhadane@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c
index 68cb7f9b9ef354a9096114e4cd8937da5c8b81d7..738ae522c8f4fa234520572cb8f0704111c5b2ba 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_device.c
+++ b/drivers/gpu/drm/i915/display/intel_display_device.c
@@ -1357,6 +1357,12 @@ static const struct intel_display_device_info xe2_hpd_display = {
                BIT(PORT_TC1) | BIT(PORT_TC2) | BIT(PORT_TC3) | BIT(PORT_TC4),
 };
 
+static const u16 mtl_u_ids[] = {
+       INTEL_MTL_U_IDS(ID),
+       INTEL_ARL_U_IDS(ID),
+       0
+};
+
 /*
  * Do not initialize the .info member of the platform desc for GMD ID based
  * platforms. Their display will be probed automatically based on the IP version
@@ -1364,6 +1370,13 @@ static const struct intel_display_device_info xe2_hpd_display = {
  */
 static const struct platform_desc mtl_desc = {
        PLATFORM(meteorlake),
+       .subplatforms = (const struct subplatform_desc[]) {
+               {
+                       SUBPLATFORM(meteorlake, u),
+                       .pciidlist = mtl_u_ids,
+               },
+               {},
+       }
 };
 
 static const struct platform_desc lnl_desc = {

diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h b/drivers/gpu/drm/i915/display/intel_display_device.h
index 9a333d9e660105d0ae06dccc62a6467d2283546d..5853472bb9c22645cd326026d2e4b0ec50adb65f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_device.h
+++ b/drivers/gpu/drm/i915/display/intel_display_device.h
@@ -96,6 +96,7 @@ struct pci_dev;
        func(dg2_g12) \
        /* Display ver 14 (based on GMD ID) */ \
        func(meteorlake) \
+       func(meteorlake_u) \
        /* Display ver 20 (based on GMD ID) */ \
        func(lunarlake) \
        /* Display ver 14.1 (based on GMD ID) */ \

diff --git a/include/drm/intel/pciids.h b/include/drm/intel/pciids.h
index c6518b0992cf34bea844a1e3d34ed50f1b3cb939..46b05fa1f903041de4490c37e2ecf5f5bd9a5709 100644 (file)
--- a/include/drm/intel/pciids.h
+++ b/include/drm/intel/pciids.h
@@ -811,9 +811,12 @@
        INTEL_ARL_S_IDS(MACRO__, ## __VA_ARGS__)
 
 /* MTL */
-#define INTEL_MTL_IDS(MACRO__, ...) \
+#define INTEL_MTL_U_IDS(MACRO__, ...) \
        MACRO__(0x7D40, ## __VA_ARGS__), \
-       MACRO__(0x7D45, ## __VA_ARGS__), \
+       MACRO__(0x7D45, ## __VA_ARGS__)
+
+#define INTEL_MTL_IDS(MACRO__, ...) \
+       INTEL_MTL_U_IDS(MACRO__, ## __VA_ARGS__), \
        MACRO__(0x7D55, ## __VA_ARGS__), \
        MACRO__(0x7D60, ## __VA_ARGS__), \
        MACRO__(0x7DD5, ## __VA_ARGS__)