Commit 802cbbc0 authored by Imre Deak's avatar Imre Deak

drm/i915: Move load time runtime PM get later

We require the device to be powered only before accessing it, so we can
move this call later.
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1458128348-15730-9-git-send-email-imre.deak@intel.com
parent 40ae4e16
...@@ -1033,8 +1033,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) ...@@ -1033,8 +1033,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
intel_init_audio_hooks(dev_priv); intel_init_audio_hooks(dev_priv);
i915_gem_load_init(dev); i915_gem_load_init(dev);
intel_runtime_pm_get(dev_priv);
intel_display_crc_init(dev); intel_display_crc_init(dev);
i915_dump_device_info(dev_priv); i915_dump_device_info(dev_priv);
...@@ -1047,6 +1045,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) ...@@ -1047,6 +1045,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
DRM_INFO("This is an early pre-production Haswell machine. " DRM_INFO("This is an early pre-production Haswell machine. "
"It may not be fully functional.\n"); "It may not be fully functional.\n");
intel_runtime_pm_get(dev_priv);
if (i915_get_bridge_dev(dev)) { if (i915_get_bridge_dev(dev)) {
ret = -EIO; ret = -EIO;
goto out_runtime_pm_put; goto out_runtime_pm_put;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment