drm/i915/pm: drop intel_pm_setup()

All the init in intel_pm_setup() is related to runtime pm. Move them to
intel_runtime_pm_init_early(), and remove intel_pm_setup().

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/b01f9bf0afa9abaece5d0f76aecde69e2679f662.1677678803.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 4b40522b0207760fe8200f12297caba45ce574e8..3539eb2bef1ff16d74ff1712acfad7fd84e71983 100644 (file)
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -250,7 +250,6 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)
        /* This must be called before any calls to HAS_PCH_* */
        intel_detect_pch(dev_priv);
 
-       intel_pm_setup(dev_priv);
        intel_irq_init(dev_priv);
        intel_init_display_hooks(dev_priv);
        intel_init_clock_gating_hooks(dev_priv);

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 0cb2f8db5e5f6ecc9f0d018bf46214b3b661e994..605c72eba94a3f2f4718dc8d6488640caf229bf0 100644 (file)
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -899,9 +899,3 @@ void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv)
                dev_priv->clock_gating_funcs = &nop_clock_gating_funcs;
        }
 }
-
-void intel_pm_setup(struct drm_i915_private *dev_priv)
-{
-       dev_priv->runtime_pm.suspended = false;
-       atomic_set(&dev_priv->runtime_pm.wakeref_count, 0);
-}

diff --git a/drivers/gpu/drm/i915/intel_pm.h b/drivers/gpu/drm/i915/intel_pm.h
index eab60df0c6bb13f74d96745235a77359c1e90669..1dd464d2d1861f5c108193fb72b1bd01d62fdbe4 100644 (file)
--- a/drivers/gpu/drm/i915/intel_pm.h
+++ b/drivers/gpu/drm/i915/intel_pm.h
@@ -15,6 +15,5 @@ struct intel_plane_state;
 void intel_init_clock_gating(struct drm_i915_private *dev_priv);
 void intel_suspend_hw(struct drm_i915_private *dev_priv);
 void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv);
-void intel_pm_setup(struct drm_i915_private *dev_priv);
 
 #endif /* __INTEL_PM_H__ */

diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 129746713d072f06e7ad1a3e4ad3b8e8aaeb8898..cf5122299b6b8c36a85bee5ab5af3dd6e85a1fb6 100644 (file)
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -652,6 +652,8 @@ void intel_runtime_pm_init_early(struct intel_runtime_pm *rpm)
 
        rpm->kdev = kdev;
        rpm->available = HAS_RUNTIME_PM(i915);
+       rpm->suspended = false;
+       atomic_set(&rpm->wakeref_count, 0);
 
        init_intel_runtime_pm_wakeref(rpm);
        INIT_LIST_HEAD(&rpm->lmem_userfault_list);