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

Commit 13c8f4c8 authored by Imre Deak's avatar Imre Deak
Browse files

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: 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-7-git-send-email-imre.deak@intel.com
parent bb400da9

drivers/gpu/drm/i915/i915_dma.c

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