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

Commit 20652097 authored by Zhenyu Wang's avatar Zhenyu Wang Committed by Daniel Vetter
Browse files

drm/i915: Fix missed needs_dmar setting 



From Ben's AGP dependence removal change, "needs_dmar" flag has not
been properly setup for new chips using new GTT init function. This
one adds missed setting of that flag to make sure we do pci mappings
with IOMMU enabled.

Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 335c07b7

drivers/gpu/drm/i915/i915_gem_gtt.c

+4 −0
Original line number Diff line number Diff line
@@ -639,6 +639,10 @@ int i915_gem_gtt_init(struct drm_device *dev) 
	if (!pci_set_dma_mask(dev->pdev, DMA_BIT_MASK(40)))

		pci_set_consistent_dma_mask(dev->pdev, DMA_BIT_MASK(40));



#ifdef CONFIG_INTEL_IOMMU

	dev_priv->mm.gtt->needs_dmar = 1;

#endif



	/* For GEN6+ the PTEs for the ggtt live at 2MB + BAR0 */

	gtt_bus_addr = pci_resource_start(dev->pdev, 0) + (2<<20);

	dev_priv->mm.gtt->gma_bus_addr = pci_resource_start(dev->pdev, 2);