From: Imre Deak Date: Wed, 16 Mar 2016 11:38:57 +0000 (+0200) Subject: drm/i915: Move load time runtime PM get later X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=802cbbc09b96eed654233020d8f6d486ddc5123b;p=openwrt%2Fstaging%2Fblogic.git 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 Reviewed-by: Chris Wilson 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 b89fa735092f..a07e359b1ace 100644 --- 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;