diff options
| author | Imre Deak <imre.deak@intel.com> | 2016-03-16 14:38:55 +0300 |
|---|---|---|
| committer | Imre Deak <imre.deak@intel.com> | 2016-03-17 16:22:05 +0300 |
| commit | 13c8f4c8cd481ec80bfe3b71f1f21e18bad98efb (patch) | |
| tree | b46bd39b8cc1c7055c997e6ba408ed8a99f668a9 | |
| parent | bb400da99836793ade6f1a007db58af2f1b57e9e (diff) | |
| download | linux-13c8f4c8cd481ec80bfe3b71f1f21e18bad98efb.tar.xz | |
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 <imre.deak@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1458128348-15730-7-git-send-email-imre.deak@intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) |