Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3487b66b authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915: Move load time audio component registration earlier 



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

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-11-git-send-email-imre.deak@intel.com
parent 80741e99

drivers/gpu/drm/i915/i915_dma.c

+4 −4
Original line number Diff line number Diff line
@@ -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);