On Tue, Jun 18, 2024 at 05:22:56PM +0300, Jani Nikula wrote:
> The display platform enums are not really needed for anything. Remove.
>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_display_device.c | 12 +++---------
> drivers/gpu/drm/i915/display/intel_display_device.h | 11 -----------
> 2 files changed, 3 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 954caea38005..6a71e7a8b686 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_device.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_device.c
> @@ -22,26 +22,22 @@ __diag_ignore_all("-Woverride-init", "Allow field initialization overrides for d
>
> struct subplatform_desc {
> struct intel_display_is is;
> - enum intel_display_platform subplatform;
> const char *name;
> const u16 *pciidlist;
> };
>
> #define SUBPLATFORM(_platform, _subplatform) \
> - .subplatform = (INTEL_DISPLAY_##_platform##_##_subplatform), \
> .name = #_subplatform, \
> .is._platform##_##_subplatform = 1
>
> struct platform_desc {
> struct intel_display_is is;
> - enum intel_display_platform platform;
> const char *name;
> const struct subplatform_desc *subplatforms;
> const struct intel_display_device_info *info; /* NULL for GMD ID */
> };
>
> #define PLATFORM(_platform) \
> - .platform = (INTEL_DISPLAY_##_platform), \
> .name = #_platform, \
> .is._platform = 1
>
> @@ -1261,7 +1257,7 @@ find_subplatform_desc(struct pci_dev *pdev, const struct platform_desc *desc)
> const struct subplatform_desc *sp;
> const u16 *id;
>
> - for (sp = desc->subplatforms; sp && sp->subplatform; sp++)
> + for (sp = desc->subplatforms; sp && sp->pciidlist; sp++)
> for (id = sp->pciidlist; *id; id++)
> if (*id == pdev->device)
> return sp;
> @@ -1323,14 +1319,12 @@ void intel_display_device_probe(struct drm_i915_private *i915)
> &DISPLAY_INFO(i915)->__runtime_defaults,
> sizeof(*DISPLAY_RUNTIME_INFO(i915)));
>
> - drm_WARN_ON(&i915->drm, !desc->platform || !desc->name);
> - DISPLAY_RUNTIME_INFO(i915)->platform = desc->platform;
> + drm_WARN_ON(&i915->drm, !desc->name);
> display->is = desc->is;
>
> subdesc = find_subplatform_desc(pdev, desc);
> if (subdesc) {
> - drm_WARN_ON(&i915->drm, !subdesc->subplatform || !subdesc->name);
> - DISPLAY_RUNTIME_INFO(i915)->subplatform = subdesc->subplatform;
> + drm_WARN_ON(&i915->drm, !subdesc->name);
> merge_display_is(&display->is, &subdesc->is);
> }
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h b/drivers/gpu/drm/i915/display/intel_display_device.h
> index 73070c8487ff..97033d26c1b3 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_device.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_device.h
> @@ -93,14 +93,6 @@ struct drm_printer;
> func(DG2_G11) \
> func(DG2_G12)
>
> -#define ENUM(x) INTEL_DISPLAY_ ## x,
> -
> -enum intel_display_platform {
> - INTEL_DISPLAY_PLATFORMS(ENUM)
> -};
> -
> -#undef ENUM
> -
> #define MEMBER(name) u32 name:1;
>
> struct intel_display_is {
> @@ -207,9 +199,6 @@ struct intel_display_is {
> (DISPLAY_VER(i915) >= (from) && DISPLAY_VER(i915) <= (until))
>
> struct intel_display_runtime_info {
> - enum intel_display_platform platform;
> - enum intel_display_platform subplatform;
> -
> struct intel_display_ip_ver {
> u16 ver;
> u16 rel;
> --
> 2.39.2
>
