From: Imre Deak Date: Wed, 16 Mar 2016 11:38:55 +0000 (+0200) Subject: drm/i915: Move load time runtime device info init earlier X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=13c8f4c8cd481ec80bfe3b71f1f21e18bad98efb;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git drm/i915: Move load time runtime device info init earlier This init step accesses the device, but doesn't have any device specific side effect. It also sets up some platform specific attributes that may be required early, so move it earlier. Signed-off-by: Imre Deak Reviewed-by: Chris Wilson Link: http://patchwork.freedesktop.org/patch/msgid/1458128348-15730-7-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 a3c5621dec8f..a94610a6e2c8 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1057,6 +1057,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) intel_uncore_init(dev); + intel_device_info_runtime_init(dev); + ret = i915_gem_gtt_init(dev); if (ret) goto out_uncore_fini; @@ -1131,8 +1133,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) DRM_DEBUG_DRIVER("can't enable MSI"); } - intel_device_info_runtime_init(dev); - if (INTEL_INFO(dev)->num_pipes) { ret = drm_vblank_init(dev, INTEL_INFO(dev)->num_pipes); if (ret)