drm/i915/display: reindent subplatform initialization

Make the subplatform initialization less cramped, and follow the coding
style more closely. Initialize .pciidlist using designated initializers.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/0b7c3c44e4111c07e38a4bc842bbbced6f97c827.1730144869.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@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 9031b85bb0008aa83a6ef923e90fe43aa5fcbd6a..459ea4e1fa03ce6000bc0a74ac01814493ef120b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_device.c
+++ b/drivers/gpu/drm/i915/display/intel_display_device.c
@@ -498,8 +498,14 @@ static const u16 hsw_ulx_ids[] = {
 static const struct platform_desc hsw_desc = {
        PLATFORM(HASWELL),
        .subplatforms = (const struct subplatform_desc[]) {
-               { INTEL_DISPLAY_HASWELL_ULT, "ULT", hsw_ult_ids },
-               { INTEL_DISPLAY_HASWELL_ULX, "ULX", hsw_ulx_ids },
+               {
+                       INTEL_DISPLAY_HASWELL_ULT, "ULT",
+                       .pciidlist = hsw_ult_ids,
+               },
+               {
+                       INTEL_DISPLAY_HASWELL_ULX, "ULX",
+                       .pciidlist = hsw_ulx_ids,
+               },
                {},
        },
        .info = &(const struct intel_display_device_info) {
@@ -542,8 +548,14 @@ static const u16 bdw_ulx_ids[] = {
 static const struct platform_desc bdw_desc = {
        PLATFORM(BROADWELL),
        .subplatforms = (const struct subplatform_desc[]) {
-               { INTEL_DISPLAY_BROADWELL_ULT, "ULT", bdw_ult_ids },
-               { INTEL_DISPLAY_BROADWELL_ULX, "ULX", bdw_ulx_ids },
+               {
+                       INTEL_DISPLAY_BROADWELL_ULT, "ULT",
+                       .pciidlist = bdw_ult_ids,
+               },
+               {
+                       INTEL_DISPLAY_BROADWELL_ULX, "ULX",
+                       .pciidlist = bdw_ulx_ids,
+               },
                {},
        },
        .info = &(const struct intel_display_device_info) {
@@ -633,8 +645,14 @@ static const enum intel_step skl_steppings[] = {
 static const struct platform_desc skl_desc = {
        PLATFORM(SKYLAKE),
        .subplatforms = (const struct subplatform_desc[]) {
-               { INTEL_DISPLAY_SKYLAKE_ULT, "ULT", skl_ult_ids },
-               { INTEL_DISPLAY_SKYLAKE_ULX, "ULX", skl_ulx_ids },
+               {
+                       INTEL_DISPLAY_SKYLAKE_ULT, "ULT",
+                       .pciidlist = skl_ult_ids,
+               },
+               {
+                       INTEL_DISPLAY_SKYLAKE_ULX, "ULX",
+                       .pciidlist = skl_ulx_ids,
+               },
                {},
        },
        .info = &skl_display,
@@ -668,8 +686,14 @@ static const enum intel_step kbl_steppings[] = {
 static const struct platform_desc kbl_desc = {
        PLATFORM(KABYLAKE),
        .subplatforms = (const struct subplatform_desc[]) {
-               { INTEL_DISPLAY_KABYLAKE_ULT, "ULT", kbl_ult_ids },
-               { INTEL_DISPLAY_KABYLAKE_ULX, "ULX", kbl_ulx_ids },
+               {
+                       INTEL_DISPLAY_KABYLAKE_ULT, "ULT",
+                       .pciidlist = kbl_ult_ids,
+               },
+               {
+                       INTEL_DISPLAY_KABYLAKE_ULX, "ULX",
+                       .pciidlist = kbl_ulx_ids,
+               },
                {},
        },
        .info = &skl_display,
@@ -693,8 +717,14 @@ static const u16 cfl_ulx_ids[] = {
 static const struct platform_desc cfl_desc = {
        PLATFORM(COFFEELAKE),
        .subplatforms = (const struct subplatform_desc[]) {
-               { INTEL_DISPLAY_COFFEELAKE_ULT, "ULT", cfl_ult_ids },
-               { INTEL_DISPLAY_COFFEELAKE_ULX, "ULX", cfl_ulx_ids },
+               {
+                       INTEL_DISPLAY_COFFEELAKE_ULT, "ULT",
+                       .pciidlist = cfl_ult_ids,
+               },
+               {
+                       INTEL_DISPLAY_COFFEELAKE_ULX, "ULX",
+                       .pciidlist = cfl_ulx_ids,
+               },
                {},
        },
        .info = &skl_display,
@@ -709,7 +739,10 @@ static const u16 cml_ult_ids[] = {
 static const struct platform_desc cml_desc = {
        PLATFORM(COMETLAKE),
        .subplatforms = (const struct subplatform_desc[]) {
-               { INTEL_DISPLAY_COMETLAKE_ULT, "ULT", cml_ult_ids },
+               {
+                       INTEL_DISPLAY_COMETLAKE_ULT, "ULT",
+                       .pciidlist = cml_ult_ids,
+               },
                {},
        },
        .info = &skl_display,
@@ -825,7 +858,10 @@ static const enum intel_step icl_steppings[] = {
 static const struct platform_desc icl_desc = {
        PLATFORM(ICELAKE),
        .subplatforms = (const struct subplatform_desc[]) {
-               { INTEL_DISPLAY_ICELAKE_PORT_F, "Port F", icl_port_f_ids },
+               {
+                       INTEL_DISPLAY_ICELAKE_PORT_F, "Port F",
+                       .pciidlist = icl_port_f_ids,
+               },
                {},
        },
        .info = &(const struct intel_display_device_info) {
@@ -922,8 +958,11 @@ static const enum intel_step tgl_uy_steppings[] = {
 static const struct platform_desc tgl_desc = {
        PLATFORM(TIGERLAKE),
        .subplatforms = (const struct subplatform_desc[]) {
-               { INTEL_DISPLAY_TIGERLAKE_UY, "UY", tgl_uy_ids,
-                 STEP_INFO(tgl_uy_steppings) },
+               {
+                       INTEL_DISPLAY_TIGERLAKE_UY, "UY",
+                       .pciidlist = tgl_uy_ids,
+                       STEP_INFO(tgl_uy_steppings),
+               },
                {},
        },
        .info = &(const struct intel_display_device_info) {
@@ -999,8 +1038,11 @@ static const enum intel_step adl_s_rpl_s_steppings[] = {
 static const struct platform_desc adl_s_desc = {
        PLATFORM(ALDERLAKE_S),
        .subplatforms = (const struct subplatform_desc[]) {
-               { INTEL_DISPLAY_ALDERLAKE_S_RAPTORLAKE_S, "RPL-S", adls_rpls_ids,
-                 STEP_INFO(adl_s_rpl_s_steppings) },
+               {
+                       INTEL_DISPLAY_ALDERLAKE_S_RAPTORLAKE_S, "RPL-S",
+                       .pciidlist = adls_rpls_ids,
+                       STEP_INFO(adl_s_rpl_s_steppings),
+               },
                {},
        },
        .info = &(const struct intel_display_device_info) {
@@ -1103,12 +1145,21 @@ static const enum intel_step adl_p_rpl_pu_steppings[] = {
 static const struct platform_desc adl_p_desc = {
        PLATFORM(ALDERLAKE_P),
        .subplatforms = (const struct subplatform_desc[]) {
-               { INTEL_DISPLAY_ALDERLAKE_P_ALDERLAKE_N, "ADL-N", adlp_adln_ids,
-                 STEP_INFO(adl_p_adl_n_steppings) },
-               { INTEL_DISPLAY_ALDERLAKE_P_RAPTORLAKE_P, "RPL-P", adlp_rplp_ids,
-                 STEP_INFO(adl_p_rpl_pu_steppings) },
-               { INTEL_DISPLAY_ALDERLAKE_P_RAPTORLAKE_U, "RPL-U", adlp_rplu_ids,
-                 STEP_INFO(adl_p_rpl_pu_steppings) },
+               {
+                       INTEL_DISPLAY_ALDERLAKE_P_ALDERLAKE_N, "ADL-N",
+                       .pciidlist = adlp_adln_ids,
+                       STEP_INFO(adl_p_adl_n_steppings),
+               },
+               {
+                       INTEL_DISPLAY_ALDERLAKE_P_RAPTORLAKE_P, "RPL-P",
+                       .pciidlist = adlp_rplp_ids,
+                       STEP_INFO(adl_p_rpl_pu_steppings),
+               },
+               {
+                       INTEL_DISPLAY_ALDERLAKE_P_RAPTORLAKE_U, "RPL-U",
+                       .pciidlist = adlp_rplu_ids,
+                       STEP_INFO(adl_p_rpl_pu_steppings),
+               },
                {},
        },
        .info = &xe_lpd_display,
@@ -1162,12 +1213,21 @@ static const enum intel_step dg2_g12_steppings[] = {
 static const struct platform_desc dg2_desc = {
        PLATFORM(DG2),
        .subplatforms = (const struct subplatform_desc[]) {
-               { INTEL_DISPLAY_DG2_G10, "G10", dg2_g10_ids,
-                 STEP_INFO(dg2_g10_steppings) },
-               { INTEL_DISPLAY_DG2_G11, "G11", dg2_g11_ids,
-                 STEP_INFO(dg2_g11_steppings) },
-               { INTEL_DISPLAY_DG2_G12, "G12", dg2_g12_ids,
-                 STEP_INFO(dg2_g12_steppings) },
+               {
+                       INTEL_DISPLAY_DG2_G10, "G10",
+                       .pciidlist = dg2_g10_ids,
+                       STEP_INFO(dg2_g10_steppings),
+               },
+               {
+                       INTEL_DISPLAY_DG2_G11, "G11",
+                       .pciidlist = dg2_g11_ids,
+                       STEP_INFO(dg2_g11_steppings),
+               },
+               {
+                       INTEL_DISPLAY_DG2_G12, "G12",
+                       .pciidlist = dg2_g12_ids,
+                       STEP_INFO(dg2_g12_steppings),
+               },
                {},
        },
        .info = &xe_hpd_display,