intel_power_domains_resume() calling intel_display_power_init_hw() with the resume parameter is an internal implementation detail. Hide it inside intel_display_power.c, and provide a clean external interface without the parameter.
Cc: Imre Deak <[email protected]> Signed-off-by: Jani Nikula <[email protected]> --- .../drm/i915/display/intel_display_driver.c | 2 +- .../drm/i915/display/intel_display_power.c | 40 ++++++++++--------- .../drm/i915/display/intel_display_power.h | 2 +- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c index 6b7411f5c6a8..d0729936f681 100644 --- a/drivers/gpu/drm/i915/display/intel_display_driver.c +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c @@ -218,7 +218,7 @@ int intel_display_driver_probe_noirq(struct intel_display *display) intel_pmdemand_init_early(display); - intel_display_power_init_hw(display, false); + intel_display_power_init_hw(display); if (!HAS_DISPLAY(display)) return 0; diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c index 4264b9031938..88640bf1c5f7 100644 --- a/drivers/gpu/drm/i915/display/intel_display_power.c +++ b/drivers/gpu/drm/i915/display/intel_display_power.c @@ -1917,23 +1917,7 @@ static void assert_isp_power_gated(struct intel_display *display) static void intel_power_domains_verify_state(struct intel_display *display); -/** - * intel_display_power_init_hw - initialize hardware power domain state - * @display: display device instance - * @resume: Called from resume code paths or not - * - * This function initializes the hardware power domain state and enables all - * power wells belonging to the INIT power domain. Power wells in other - * domains (and not in the INIT domain) are referenced or disabled by - * intel_modeset_readout_hw_state(). After that the reference count of each - * power well must match its HW enabled state, see - * intel_power_domains_verify_state(). - * - * It will return with power domains disabled (to be enabled later by - * intel_display_power_enable()) and must be paired with - * intel_display_power_driver_remove(). - */ -void intel_display_power_init_hw(struct intel_display *display, bool resume) +static void __intel_display_power_init_hw(struct intel_display *display, bool resume) { struct i915_power_domains *power_domains = &display->power.domains; @@ -1984,6 +1968,26 @@ void intel_display_power_init_hw(struct intel_display *display, bool resume) power_domains->initializing = false; } +/** + * intel_display_power_init_hw - initialize hardware power domain state + * @display: display device instance + * + * This function initializes the hardware power domain state and enables all + * power wells belonging to the INIT power domain. Power wells in other + * domains (and not in the INIT domain) are referenced or disabled by + * intel_modeset_readout_hw_state(). After that the reference count of each + * power well must match its HW enabled state, see + * intel_power_domains_verify_state(). + * + * It will return with power domains disabled (to be enabled later by + * intel_display_power_enable()) and must be paired with + * intel_display_power_driver_remove(). + */ +void intel_display_power_init_hw(struct intel_display *display) +{ + __intel_display_power_init_hw(display, false); +} + /** * intel_display_power_driver_remove - deinitialize hw power domain state * @display: display device instance @@ -2152,7 +2156,7 @@ static void intel_power_domains_resume(struct intel_display *display) struct i915_power_domains *power_domains = &display->power.domains; if (power_domains->display_core_suspended) { - intel_display_power_init_hw(display, true); + __intel_display_power_init_hw(display, true); power_domains->display_core_suspended = false; } else { drm_WARN_ON(display->drm, power_domains->init_wakeref); diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h index be051911514f..a43fab19e530 100644 --- a/drivers/gpu/drm/i915/display/intel_display_power.h +++ b/drivers/gpu/drm/i915/display/intel_display_power.h @@ -171,7 +171,7 @@ struct intel_display_power_domain_set { int intel_display_power_init(struct intel_display *display); void intel_display_power_cleanup(struct intel_display *display); -void intel_display_power_init_hw(struct intel_display *display, bool resume); +void intel_display_power_init_hw(struct intel_display *display); void intel_display_power_driver_remove(struct intel_display *display); void intel_display_power_enable(struct intel_display *display); void intel_display_power_disable(struct intel_display *display); -- 2.47.3
