This is v2 of [1]. I addressed the comments from Chris and Jani. The bulk of the change compared to v1 stems from Chris' idea to split the different init steps into separate functions. This required some further code shuffling as a preparation, hence the additional patches. In the end driver load error path and dirver unload function became much clearer. The init steps on the modesetting path would still need to be moved to one of the new init phases functions according to the role/effect of the given init step, but I left this for later. Smoke tested on Gen4, SNB, IVB, BXT. [1] https://lists.freedesktop.org/archives/intel-gfx/2016-March/089328.html CC: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> CC: Jani Nikula <jani.nikula@xxxxxxxxx> CC: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@xxxxxxxxx> Imre Deak (17): Fix MCHBAR cleanup on the driver init error path drm/i915: Move load time PCH detect, DPIO, power domain SW init earlier drm/i915: Move load time IRQ SW init earlier drm/i915: Move load time init of display/audio hooks earlier drm/i915: Move load time init of clock gating hooks earlier drm/i915: Move load time runtime device info init earlier drm/i915: Move load time gem_load_init earlier drm/i915: Move load time runtime PM get later drm/i915: Move load time shrinker registration later drm/i915: Move load time audio component registration earlier drm/i915: Move unload time display power domain uninit later drm/i915: Move unload time GTT, MSI IRQ cleanup later drm/i915: Move unload time opregion unregistration earlier drm/i915: Split out load time early initialization drm/i915: Split out load time MMIO initialization drm/i915: Split out load time HW initialization drm/i915: Split out load time interface registration drivers/gpu/drm/i915/i915_dma.c | 372 +++++++++++++++++++++++------------ drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gem.c | 34 ++-- drivers/gpu/drm/i915/i915_irq.c | 2 - drivers/gpu/drm/i915/intel_audio.c | 16 +- drivers/gpu/drm/i915/intel_display.c | 82 ++++---- drivers/gpu/drm/i915/intel_drv.h | 4 +- drivers/gpu/drm/i915/intel_pm.c | 93 +++++---- 8 files changed, 374 insertions(+), 230 deletions(-) -- 2.5.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx