From: Imre Deak Date: Wed, 16 Mar 2016 11:38:59 +0000 (+0200) Subject: drm/i915: Move load time audio component registration earlier X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3487b66ba13c1a7ba1185028ad0dae95e97bd4d2;p=openwrt%2Fstaging%2Fblogic.git drm/i915: Move load time audio component registration earlier We should register all the interfaces before we enable runtime PM. Signed-off-by: Imre Deak Reviewed-by: Chris Wilson Link: http://patchwork.freedesktop.org/patch/msgid/1458128348-15730-11-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 2d279a60d3c4..2bdafa998704 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1164,10 +1164,10 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) if (IS_GEN5(dev)) intel_gpu_ips_init(dev_priv); - intel_runtime_pm_enable(dev_priv); - i915_audio_component_init(dev_priv); + intel_runtime_pm_enable(dev_priv); + intel_runtime_pm_put(dev_priv); return 0; @@ -1206,8 +1206,6 @@ int i915_driver_unload(struct drm_device *dev) intel_fbdev_fini(dev); - i915_audio_component_cleanup(dev_priv); - ret = i915_gem_suspend(dev); if (ret) { DRM_ERROR("failed to idle hardware: %d\n", ret); @@ -1216,6 +1214,8 @@ int i915_driver_unload(struct drm_device *dev) intel_power_domains_fini(dev_priv); + i915_audio_component_cleanup(dev_priv); + intel_gpu_ips_teardown(); i915_teardown_sysfs(dev);