drm/i915: Bikeshed rpm functions name a bit.

- fini goes with init, so call it intel_power_domains_fini. While
  at it shovel some of the fini code that leaked out of it back in.

- give power_enabled functions the verb _is_ to make the meaning clearer.
  Also use a __ prefix instead of _unlocked to really discourage users.

- rename runtime_pm_init/fini to enable/disable since that's what they do.

Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 4 insertions, 8 deletions

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 1c035c49577e..261fc0b60f25 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1798,12 +1798,12 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
         if (IS_GEN5(dev))
                 intel_gpu_ips_init(dev_priv);
 
-        intel_init_runtime_pm(dev_priv);
+        intel_runtime_pm_enable(dev_priv);
 
         return 0;
 
 out_power_well:
-        intel_power_domains_remove(dev_priv);
+        intel_power_domains_fini(dev_priv);
         drm_vblank_cleanup(dev);
 out_gem_unload:
         WARN_ON(unregister_oom_notifier(&dev_priv->mm.oom_notifier));
@@ -1846,15 +1846,11 @@ int i915_driver_unload(struct drm_device *dev)
                 return ret;
         }
 
-        intel_fini_runtime_pm(dev_priv);
+        intel_runtime_pm_disable(dev_priv);
 
         intel_gpu_ips_teardown();
 
-        /* The i915.ko module is still not prepared to be loaded when
-         * the power well is not enabled, so just enable it in case
-         * we're going to unload/reload. */
-        intel_display_set_init_power(dev_priv, true);
-        intel_power_domains_remove(dev_priv);
+        intel_power_domains_fini(dev_priv);
 
         i915_teardown_sysfs(dev);