diff options
| author | Daniel Vetter | 2014-09-30 10:56:41 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-10-01 10:53:00 +0200 |
| commit | 41373cd53fdeb658fadd8cd0313591ce49e4342f (patch) | |
| tree | 09ea05e911ffc65e954d0f3f48404676c299287e /drivers/gpu/drm/i915/i915_dma.c | |
| parent | drm/i915: Move intel_display_set_init_power to intel_runtime_pm.c (diff) | |
| download | kernel-qcow2-linux-41373cd53fdeb658fadd8cd0313591ce49e4342f.tar.gz kernel-qcow2-linux-41373cd53fdeb658fadd8cd0313591ce49e4342f.tar.xz kernel-qcow2-linux-41373cd53fdeb658fadd8cd0313591ce49e4342f.zip | |
drm/i915: Call runtime_pm_disable directly
Allows us to mark it static and so forgoe the kerneldoc for it.
Note that intel_power_domains_fini is also called from failure paths
in the driver load sequence. But the call to runtime_pm_disable for
that is harmless since by default runtime pm is already disabled.
v2: Augment the commit message as discussed with Imre on irc.
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 261fc0b60f25..d58c711a55c4 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1846,12 +1846,10 @@ int i915_driver_unload(struct drm_device *dev) return ret; } - intel_runtime_pm_disable(dev_priv); + intel_power_domains_fini(dev_priv); intel_gpu_ips_teardown(); - intel_power_domains_fini(dev_priv); - i915_teardown_sysfs(dev); WARN_ON(unregister_oom_notifier(&dev_priv->mm.oom_notifier)); |