| Message ID | 8dbb0fc4a979dba2b1030384f6dde20ac622d1ba.1727699233.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/display: platform identification with display->platform.<platform> | expand |
On Mon, Sep 30, 2024 at 03:31:02PM +0300, Jani Nikula wrote: > Make the subplatform initialization less cramped, and follow the coding > style more closely. Initialize .pciidlist using designated initializers. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > --- > .../drm/i915/display/intel_display_device.c | 116 +++++++++++++----- > 1 file changed, 88 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 f33062322c66..93c751fde1a9 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_device.c > +++ b/drivers/gpu/drm/i915/display/intel_display_device.c > @@ -497,8 +497,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) { > @@ -541,8 +547,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) { > @@ -632,8 +644,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, > @@ -667,8 +685,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, > @@ -692,8 +716,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, > @@ -708,7 +738,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, > @@ -824,7 +857,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) { > @@ -921,8 +957,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) { > @@ -998,8 +1037,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) { > @@ -1102,12 +1144,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, > @@ -1161,12 +1212,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, > -- > 2.39.5 >
diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c index f33062322c66..93c751fde1a9 100644 --- a/drivers/gpu/drm/i915/display/intel_display_device.c +++ b/drivers/gpu/drm/i915/display/intel_display_device.c @@ -497,8 +497,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) { @@ -541,8 +547,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) { @@ -632,8 +644,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, @@ -667,8 +685,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, @@ -692,8 +716,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, @@ -708,7 +738,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, @@ -824,7 +857,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) { @@ -921,8 +957,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) { @@ -998,8 +1037,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) { @@ -1102,12 +1144,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, @@ -1161,12 +1212,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,
Make the subplatform initialization less cramped, and follow the coding style more closely. Initialize .pciidlist using designated initializers. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- .../drm/i915/display/intel_display_device.c | 116 +++++++++++++----- 1 file changed, 88 insertions(+), 28 deletions(-)