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

Commit c3d685a7 authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915: Do PCH and uncore init earlier 



For future platforms we'll need to initialize our MMIO function pointers
even earlier. Specifically, we'll need to be able to have register
reads/writes at GTT initialization (in i915_gem_gtt_init). Similarly,
these platforms also have MMIO differences based on the PCH id, so
while moving stuff around, also move the PCH initialization.

CC: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
[danvet: Mention the function where we need register access.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5ade2c2f

drivers/gpu/drm/i915/i915_dma.c

+6 −4
Original line number Diff line number Diff line
@@ -1542,6 +1542,11 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 


	intel_uncore_early_sanitize(dev);



	/* This must be called before any calls to HAS_PCH_* */

	intel_detect_pch(dev);



	intel_uncore_init(dev);



	ret = i915_gem_gtt_init(dev);

	if (ret)

		goto out_regs;
@@ -1599,12 +1604,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
		goto out_mtrrfree;

	}



	/* This must be called before any calls to HAS_PCH_* */

	intel_detect_pch(dev);



	intel_irq_init(dev);

	intel_pm_init(dev);

	intel_uncore_init(dev);

	intel_uncore_sanitize(dev);



	/* Try to make sure MCHBAR is enabled before poking at it */
@@ -1689,6 +1690,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	drm_mm_takedown(&dev_priv->gtt.base.mm);

	dev_priv->gtt.base.cleanup(&dev_priv->gtt.base);

out_regs:

	intel_uncore_fini(dev);

	pci_iounmap(dev->pdev, dev_priv->regs);

put_bridge:

	pci_dev_put(dev_priv->bridge_dev);