We'll want to use the subplatforms similar to platforms. Join the
subplatforms next to their corresponding platforms. Update the comment
while at it.
v2: Put the subplatforms next to the platforms
Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
---
.../drm/i915/display/intel_display_device.c | 2 +-
.../drm/i915/display/intel_display_device.h | 54 +++++++++----------
2 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c
index d311edbfc069..ab98a69b84a7 100644
--- a/drivers/gpu/drm/i915/display/intel_display_device.c
+++ b/drivers/gpu/drm/i915/display/intel_display_device.c
@@ -31,7 +31,7 @@ struct stepping_desc {
.step_info.size = ARRAY_SIZE(_map)
struct subplatform_desc {
- enum intel_display_subplatform subplatform;
+ enum intel_display_platform subplatform;
const char *name;
const u16 *pciidlist;
struct stepping_desc step_info;
diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h b/drivers/gpu/drm/i915/display/intel_display_device.h
index 1cc1a2de9e6a..dc425e2661bc 100644
--- a/drivers/gpu/drm/i915/display/intel_display_device.h
+++ b/drivers/gpu/drm/i915/display/intel_display_device.h
@@ -14,7 +14,11 @@
struct drm_i915_private;
struct drm_printer;
-/* Keep in gen based order, and chronological order within a gen */
+/*
+ * Display platforms and subplatforms. Keep platforms in display version based
+ * order, chronological order within a version, and subplatforms next to the
+ * platform.
+ */
#define INTEL_DISPLAY_PLATFORMS(func) \
func(PLATFORM_UNINITIALIZED) \
/* Display ver 2 */ \
@@ -42,28 +46,49 @@ struct drm_printer;
func(IVYBRIDGE) \
func(VALLEYVIEW) \
func(HASWELL) \
+ func(HASWELL_ULT) \
+ func(HASWELL_ULX) \
/* Display ver 8 */ \
func(BROADWELL) \
+ func(BROADWELL_ULT) \
+ func(BROADWELL_ULX) \
func(CHERRYVIEW) \
/* Display ver 9 */ \
func(SKYLAKE) \
+ func(SKYLAKE_ULT) \
+ func(SKYLAKE_ULX) \
func(BROXTON) \
func(KABYLAKE) \
+ func(KABYLAKE_ULT) \
+ func(KABYLAKE_ULX) \
func(GEMINILAKE) \
func(COFFEELAKE) \
+ func(COFFEELAKE_ULT) \
+ func(COFFEELAKE_ULX) \
func(COMETLAKE) \
+ func(COMETLAKE_ULT) \
+ func(COMETLAKE_ULX) \
/* Display ver 11 */ \
func(ICELAKE) \
+ func(ICELAKE_PORT_F) \
func(JASPERLAKE) \
func(ELKHARTLAKE) \
/* Display ver 12 */ \
func(TIGERLAKE) \
+ func(TIGERLAKE_UY) \
func(ROCKETLAKE) \
func(DG1) \
func(ALDERLAKE_S) \
+ func(ALDERLAKE_S_RAPTORLAKE_S) \
/* Display ver 13 */ \
func(ALDERLAKE_P) \
+ func(ALDERLAKE_P_ALDERLAKE_N) \
+ func(ALDERLAKE_P_RAPTORLAKE_P) \
+ func(ALDERLAKE_P_RAPTORLAKE_U) \
func(DG2) \
+ func(DG2_G10) \
+ func(DG2_G11) \
+ func(DG2_G12) \
/* Display ver 14 (based on GMD ID) */ \
func(METEORLAKE) \
/* Display ver 20 (based on GMD ID) */ \
@@ -79,31 +104,6 @@ enum intel_display_platform {
#undef __ENUM
-enum intel_display_subplatform {
- INTEL_DISPLAY_SUBPLATFORM_UNINITIALIZED = 0,
- INTEL_DISPLAY_HASWELL_ULT,
- INTEL_DISPLAY_HASWELL_ULX,
- INTEL_DISPLAY_BROADWELL_ULT,
- INTEL_DISPLAY_BROADWELL_ULX,
- INTEL_DISPLAY_SKYLAKE_ULT,
- INTEL_DISPLAY_SKYLAKE_ULX,
- INTEL_DISPLAY_KABYLAKE_ULT,
- INTEL_DISPLAY_KABYLAKE_ULX,
- INTEL_DISPLAY_COFFEELAKE_ULT,
- INTEL_DISPLAY_COFFEELAKE_ULX,
- INTEL_DISPLAY_COMETLAKE_ULT,
- INTEL_DISPLAY_COMETLAKE_ULX,
- INTEL_DISPLAY_ICELAKE_PORT_F,
- INTEL_DISPLAY_TIGERLAKE_UY,
- INTEL_DISPLAY_ALDERLAKE_S_RAPTORLAKE_S,
- INTEL_DISPLAY_ALDERLAKE_P_ALDERLAKE_N,
- INTEL_DISPLAY_ALDERLAKE_P_RAPTORLAKE_P,
- INTEL_DISPLAY_ALDERLAKE_P_RAPTORLAKE_U,
- INTEL_DISPLAY_DG2_G10,
- INTEL_DISPLAY_DG2_G11,
- INTEL_DISPLAY_DG2_G12,
-};
-
#define DEV_INFO_DISPLAY_FOR_EACH_FLAG(func) \
/* Keep in alphabetical order */ \
func(cursor_needs_physical); \
@@ -211,7 +211,7 @@ enum intel_display_subplatform {
struct intel_display_runtime_info {
enum intel_display_platform platform;
- enum intel_display_subplatform subplatform;
+ enum intel_display_platform subplatform;
struct intel_display_ip_ver {
u16 ver;
--
2.39.5
