This is v3 of the second half of [1], rebased on drm-tip (containing the first half [2]), addressing the review comments from Jouni and with a minor documentation/rename change in patch 3. [1] https://patchwork.freedesktop.org/series/99476/ [2] https://patchwork.freedesktop.org/series/100591/ Cc: Jouni Högander <jouni.hogander@xxxxxxxxx> Cc: Jani Nikula <jani.nikula@xxxxxxxxx> Imre Deak (18): drm/i915: Move per-platform power well hooks to intel_display_power_well.c drm/i915: Unexport the for_each_power_well() macros drm/i915: Move the power domain->well mappings to intel_display_power_map.c drm/i915: Move the dg2 fixed_enable_delay power well param to a common bitfield drm/i915: Move the HSW power well flags to a common bitfield drm/i915: Rename the power domain names to end with pipes/ports drm/i915: Sanitize the power well names drm/i915: Convert the power well descriptor domain mask to an array of domains drm/i915: Convert the u64 power well domains mask to a bitmap drm/i915: Simplify power well definitions by adding power well instances drm/i915: Allow platforms to share power well descriptors drm/i915: Simplify the DG1 power well descriptors drm/i915: Sanitize the ADL-S power well definition drm/i915: Sanitize the port -> DDI/AUX power domain mapping for each platform drm/i915: Remove the aliasing of power domain enum values drm/i915: Remove the ICL specific TBT power domains drm/i915: Remove duplicate DDI/AUX power domain mappings drm/i915: Remove the XELPD specific AUX and DDI power domains drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/g4x_dp.c | 3 +- drivers/gpu/drm/i915/display/g4x_hdmi.c | 3 +- drivers/gpu/drm/i915/display/icl_dsi.c | 8 +- drivers/gpu/drm/i915/display/intel_ddi.c | 6 +- drivers/gpu/drm/i915/display/intel_display.c | 150 +- drivers/gpu/drm/i915/display/intel_display.h | 4 +- .../drm/i915/display/intel_display_power.c | 4477 ++--------------- .../drm/i915/display/intel_display_power.h | 122 +- .../i915/display/intel_display_power_map.c | 1501 ++++++ .../i915/display/intel_display_power_map.h | 14 + .../i915/display/intel_display_power_well.c | 1838 ++++++- .../i915/display/intel_display_power_well.h | 132 +- drivers/gpu/drm/i915/display/intel_dpio_phy.c | 1 + drivers/gpu/drm/i915/display/intel_pps.c | 1 + drivers/gpu/drm/i915/display/intel_tc.c | 5 +- 16 files changed, 3881 insertions(+), 4385 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_map.c create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_map.h -- 2.30.2