v3 of https://lore.kernel.org/r/cover.1724092799.git.jani.nikula@xxxxxxxxx Rename display->is to display->platform. Make platform member names lowercase. Add the concept of platform and subplatform groups to handle g4x and hsw/bdw ult/ulx. Add more conversion patches at the end. Minor tweaks here and there. I've dropped the previous R-b's because there have been so many changes. I like the end result better, and I feel more comfortable merging this. BR, Jani. Jani Nikula (15): drm/i915/display: reindent subplatform initialization drm/i915/display: use a macro to initialize subplatforms drm/i915/display: use a macro to define platform enumerations drm/i915/display: join the platform and subplatform enums drm/i915/display: convert display platforms to lower case drm/i915/display: add display platforms structure with platform members drm/i915/display: add platform member to struct intel_display drm/i915/display: remove the display platform enum as unnecessary drm/i915/display: add platform group for g4x drm/i915/display: add subplatform group for HSW/BDW ULT drm/i915/bios: use display->platform.<platform> instead of IS_<PLATFORM>() drm/i915/pps: use display->platform.<platform> instead of IS_<PLATFORM>() drm/i915/tv: use display->platform.<platform> instead of IS_<PLATFORM>() drm/i915/vga: use display->platform.<platform> instead of IS_<PLATFORM>() drm/i915/vblank: use display->platform.<platform> instead of IS_<PLATFORM>() drivers/gpu/drm/i915/display/intel_bios.c | 40 +-- .../gpu/drm/i915/display/intel_display_core.h | 3 + .../drm/i915/display/intel_display_device.c | 267 +++++++++++++----- .../drm/i915/display/intel_display_device.h | 181 ++++++------ drivers/gpu/drm/i915/display/intel_pps.c | 47 ++- drivers/gpu/drm/i915/display/intel_tv.c | 10 +- drivers/gpu/drm/i915/display/intel_vblank.c | 11 +- drivers/gpu/drm/i915/display/intel_vga.c | 4 +- 8 files changed, 337 insertions(+), 226 deletions(-) -- 2.39.5