redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/i915: Move load time audio component registration earlier

Browse source 
We should register all the interfaces before we enable runtime PM.

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-11-git-send-email-imre.deak@intel.com
This commit is contained in:
Imre Deak 2016-03-16 13:38:59 +02:00
parent 80741e9928
commit 3487b66ba1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/gpu/drm/i915/i915_dma.c
View file

@ -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);