mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 04:21:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915/display: join the platform and subplatform enums

Browse Source 
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

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/de274ffcd06a249a3983905b285c05d1c89953a8.1730144869.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula
2024-10-28 21:48:37 +02:00
parent efdc22e910
commit 2ef1f7abb7
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/display/intel_display_device.c
View File

@@ -32,7 +32,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;

54
drivers/gpu/drm/i915/display/intel_display_device.h
View File

@@ -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) */ \
@@ -81,31 +106,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); \
@@ -216,7 +216,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;