On Mon, Sep 30, 2024 at 03:31:03PM +0300, Jani Nikula wrote: > Make it easier to change the underlying structures by using a macro > similar to PLATFORM() for initialization. > > The subplatform names in debug logs change slightly as they now reflect > the enum rather than manually entered names. For example, RAPTORLAKE_S > rather than RPL-S. > > Signed-off-by: Jani Nikula <[email protected]> > --- > .../drm/i915/display/intel_display_device.c | 44 ++++++++++--------- > 1 file changed, 24 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c > b/drivers/gpu/drm/i915/display/intel_display_device.c > index 93c751fde1a9..d311edbfc069 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_device.c > +++ b/drivers/gpu/drm/i915/display/intel_display_device.c > @@ -37,6 +37,10 @@ struct subplatform_desc { > struct stepping_desc step_info; > }; > > +#define SUBPLATFORM(_platform, _subplatform) \ > + .subplatform = (INTEL_DISPLAY_##_platform##_##_subplatform), \ > + .name = #_subplatform > + > struct platform_desc { > enum intel_display_platform platform; > const char *name; > @@ -498,11 +502,11 @@ static const struct platform_desc hsw_desc = { > PLATFORM(HASWELL), > .subplatforms = (const struct subplatform_desc[]) { > { > - INTEL_DISPLAY_HASWELL_ULT, "ULT", > + SUBPLATFORM(HASWELL, ULT), > .pciidlist = hsw_ult_ids, > }, > { > - INTEL_DISPLAY_HASWELL_ULX, "ULX", > + SUBPLATFORM(HASWELL, ULX), > .pciidlist = hsw_ulx_ids, > }, > {}, > @@ -548,11 +552,11 @@ static const struct platform_desc bdw_desc = { > PLATFORM(BROADWELL), > .subplatforms = (const struct subplatform_desc[]) { > { > - INTEL_DISPLAY_BROADWELL_ULT, "ULT", > + SUBPLATFORM(BROADWELL, ULT), > .pciidlist = bdw_ult_ids, > }, > { > - INTEL_DISPLAY_BROADWELL_ULX, "ULX", > + SUBPLATFORM(BROADWELL, ULX), > .pciidlist = bdw_ulx_ids, > }, > {}, > @@ -645,11 +649,11 @@ static const struct platform_desc skl_desc = { > PLATFORM(SKYLAKE), > .subplatforms = (const struct subplatform_desc[]) { > { > - INTEL_DISPLAY_SKYLAKE_ULT, "ULT", > + SUBPLATFORM(SKYLAKE, ULT), > .pciidlist = skl_ult_ids, > }, > { > - INTEL_DISPLAY_SKYLAKE_ULX, "ULX", > + SUBPLATFORM(SKYLAKE, ULX), > .pciidlist = skl_ulx_ids, > }, > {}, > @@ -686,11 +690,11 @@ static const struct platform_desc kbl_desc = { > PLATFORM(KABYLAKE), > .subplatforms = (const struct subplatform_desc[]) { > { > - INTEL_DISPLAY_KABYLAKE_ULT, "ULT", > + SUBPLATFORM(KABYLAKE, ULT), > .pciidlist = kbl_ult_ids, > }, > { > - INTEL_DISPLAY_KABYLAKE_ULX, "ULX", > + SUBPLATFORM(KABYLAKE, ULX), > .pciidlist = kbl_ulx_ids, > }, > {}, > @@ -717,11 +721,11 @@ static const struct platform_desc cfl_desc = { > PLATFORM(COFFEELAKE), > .subplatforms = (const struct subplatform_desc[]) { > { > - INTEL_DISPLAY_COFFEELAKE_ULT, "ULT", > + SUBPLATFORM(COFFEELAKE, ULT), > .pciidlist = cfl_ult_ids, > }, > { > - INTEL_DISPLAY_COFFEELAKE_ULX, "ULX", > + SUBPLATFORM(COFFEELAKE, ULX), > .pciidlist = cfl_ulx_ids, > }, > {}, > @@ -739,7 +743,7 @@ static const struct platform_desc cml_desc = { > PLATFORM(COMETLAKE), > .subplatforms = (const struct subplatform_desc[]) { > { > - INTEL_DISPLAY_COMETLAKE_ULT, "ULT", > + SUBPLATFORM(COMETLAKE, ULT), > .pciidlist = cml_ult_ids, > }, > {}, > @@ -858,7 +862,7 @@ static const struct platform_desc icl_desc = { > PLATFORM(ICELAKE), > .subplatforms = (const struct subplatform_desc[]) { > { > - INTEL_DISPLAY_ICELAKE_PORT_F, "Port F", > + SUBPLATFORM(ICELAKE, PORT_F), > .pciidlist = icl_port_f_ids, > }, > {}, > @@ -958,7 +962,7 @@ static const struct platform_desc tgl_desc = { > PLATFORM(TIGERLAKE), > .subplatforms = (const struct subplatform_desc[]) { > { > - INTEL_DISPLAY_TIGERLAKE_UY, "UY", > + SUBPLATFORM(TIGERLAKE, UY), > .pciidlist = tgl_uy_ids, > STEP_INFO(tgl_uy_steppings), > }, > @@ -1038,7 +1042,7 @@ static const struct platform_desc adl_s_desc = { > PLATFORM(ALDERLAKE_S), > .subplatforms = (const struct subplatform_desc[]) { > { > - INTEL_DISPLAY_ALDERLAKE_S_RAPTORLAKE_S, "RPL-S", > + SUBPLATFORM(ALDERLAKE_S, RAPTORLAKE_S),
these gets a bit strange now, but anyway, it is correct... Reviewed-by: Rodrigo Vivi <[email protected]> > .pciidlist = adls_rpls_ids, > STEP_INFO(adl_s_rpl_s_steppings), > }, > @@ -1145,17 +1149,17 @@ static const struct platform_desc adl_p_desc = { > PLATFORM(ALDERLAKE_P), > .subplatforms = (const struct subplatform_desc[]) { > { > - INTEL_DISPLAY_ALDERLAKE_P_ALDERLAKE_N, "ADL-N", > + SUBPLATFORM(ALDERLAKE_P, ALDERLAKE_N), > .pciidlist = adlp_adln_ids, > STEP_INFO(adl_p_adl_n_steppings), > }, > { > - INTEL_DISPLAY_ALDERLAKE_P_RAPTORLAKE_P, "RPL-P", > + SUBPLATFORM(ALDERLAKE_P, RAPTORLAKE_P), > .pciidlist = adlp_rplp_ids, > STEP_INFO(adl_p_rpl_pu_steppings), > }, > { > - INTEL_DISPLAY_ALDERLAKE_P_RAPTORLAKE_U, "RPL-U", > + SUBPLATFORM(ALDERLAKE_P, RAPTORLAKE_U), > .pciidlist = adlp_rplu_ids, > STEP_INFO(adl_p_rpl_pu_steppings), > }, > @@ -1213,17 +1217,17 @@ static const struct platform_desc dg2_desc = { > PLATFORM(DG2), > .subplatforms = (const struct subplatform_desc[]) { > { > - INTEL_DISPLAY_DG2_G10, "G10", > + SUBPLATFORM(DG2, G10), > .pciidlist = dg2_g10_ids, > STEP_INFO(dg2_g10_steppings), > }, > { > - INTEL_DISPLAY_DG2_G11, "G11", > + SUBPLATFORM(DG2, G11), > .pciidlist = dg2_g11_ids, > STEP_INFO(dg2_g11_steppings), > }, > { > - INTEL_DISPLAY_DG2_G12, "G12", > + SUBPLATFORM(DG2, G12), > .pciidlist = dg2_g12_ids, > STEP_INFO(dg2_g12_steppings), > }, > -- > 2.39.5 >
