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: Imre Deak <imre.deak@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1458128348-15730-9-git-send-email-imre.deak@intel.com

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index b89fa735092fde737c11bd56d90c6e48890869c3..a07e359b1acebdb43ce9e37f2674effc75223cdc 100644 (file)
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1033,8 +1033,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
        intel_init_audio_hooks(dev_priv);
        i915_gem_load_init(dev);
 
-       intel_runtime_pm_get(dev_priv);
-
        intel_display_crc_init(dev);
 
        i915_dump_device_info(dev_priv);
@@ -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. "
                         "It may not be fully functional.\n");
 
+       intel_runtime_pm_get(dev_priv);
+
        if (i915_get_bridge_dev(dev)) {
                ret = -EIO;
                goto out_runtime_pm_put;