[PATCH 3/5] drm/i915: separate RPL-U from RPL-P

[Jani Nikula]

RPL-S is a subplatform of ADL-S and RPL-P is a subplatform of
ADL-P. It's a bit much that RPL-P also matches RPL-U. Separate RPL-U
from RPL-P, and make RPL-U a standalone subplatform of ADL-P.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 drivers/gpu/drm/i915/intel_device_info.c | 7 +++----
 drivers/gpu/drm/i915/intel_step.c        | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index b119923f8be2..27b4a5882be3 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -182,7 +182,6 @@ static const u16 subplatform_n_ids[] = {
 
 static const u16 subplatform_rpl_ids[] = {
 	INTEL_RPLS_IDS(0),
-	INTEL_RPLU_IDS(0),
 	INTEL_RPLP_IDS(0),
 };
 
@@ -249,9 +248,9 @@ static void intel_device_info_subplatform_init(struct drm_i915_private *i915)
 	} else if (find_devid(devid, subplatform_rpl_ids,
 			      ARRAY_SIZE(subplatform_rpl_ids))) {
 		mask = BIT(INTEL_SUBPLATFORM_RPL);
-		if (find_devid(devid, subplatform_rplu_ids,
-			       ARRAY_SIZE(subplatform_rplu_ids)))
-			mask |= BIT(INTEL_SUBPLATFORM_RPLU);
+	} else if (find_devid(devid, subplatform_rplu_ids,
+			      ARRAY_SIZE(subplatform_rplu_ids))) {
+		mask |= BIT(INTEL_SUBPLATFORM_RPLU);
 	} else if (find_devid(devid, subplatform_g10_ids,
 			      ARRAY_SIZE(subplatform_g10_ids))) {
 		mask = BIT(INTEL_SUBPLATFORM_G10);
diff --git a/drivers/gpu/drm/i915/intel_step.c b/drivers/gpu/drm/i915/intel_step.c
index a5adfb5d8fd2..cf27e118ab08 100644
--- a/drivers/gpu/drm/i915/intel_step.c
+++ b/drivers/gpu/drm/i915/intel_step.c
@@ -181,7 +181,7 @@ void intel_step_init(struct drm_i915_private *i915)
 	} else if (IS_ALDERLAKE_P_N(i915)) {
 		revids = adlp_n_revids;
 		size = ARRAY_SIZE(adlp_n_revids);
-	} else if (IS_RAPTORLAKE_P(i915)) {
+	} else if (IS_RAPTORLAKE_P(i915) || IS_RAPTORLAKE_U(i915)) {
 		revids = adlp_rplp_revids;
 		size = ARRAY_SIZE(adlp_rplp_revids);
 	} else if (IS_ALDERLAKE_P(i915)) {
-- 
2.39.2