drm/i915/power: drop resume parameter from intel_display_power_init_hw()

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 <imre.deak@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Link: https://patch.msgid.link/63666514d457f548c69ccd35c02f2b8200ca08a1.1779800132.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index 6b7411f5c6a89853d31ec971d661e389e9fe4a61..d0729936f68169b2de7b937aece82e29cbb90368 100644 (file)
--- 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 ae7e65a4ec8c815b67f398036226ddcb05f849e6..b2dcfeedbd2c66614db6b05f572d726188d6f2a8 100644 (file)
--- 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 be051911514f913d0fc2d9a4718addd27f8edfc8..a43fab19e53091383fd37ae3c6604139f39c9382 100644 (file)
--- 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);