* [PATCH] drm/i915: Fix missed needs_dmar setting
@ 2012-12-13 15:47 Zhenyu Wang
2012-12-13 23:00 ` Daniel Vetter
0 siblings, 1 reply; 3+ messages in thread
From: Zhenyu Wang @ 2012-12-13 15:47 UTC (permalink / raw)
To: intel-gfx
>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: Zhenyu Wang <zhenyuw@linux.intel.com>
---
drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index cc1be53..9ae588a 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -665,6 +665,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);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: Fix missed needs_dmar setting
2012-12-13 15:47 [PATCH] drm/i915: Fix missed needs_dmar setting Zhenyu Wang
@ 2012-12-13 23:00 ` Daniel Vetter
2012-12-14 5:40 ` Ben Widawsky
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Vetter @ 2012-12-13 23:00 UTC (permalink / raw)
To: Zhenyu Wang; +Cc: intel-gfx
On Thu, Dec 13, 2012 at 11:47:47PM +0800, Zhenyu Wang wrote:
> 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: Zhenyu Wang <zhenyuw@linux.intel.com>
Nice catch! Thanks for the patch, merged to -fixes for 3.8.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: Fix missed needs_dmar setting
2012-12-13 23:00 ` Daniel Vetter
@ 2012-12-14 5:40 ` Ben Widawsky
0 siblings, 0 replies; 3+ messages in thread
From: Ben Widawsky @ 2012-12-14 5:40 UTC (permalink / raw)
To: Daniel Vetter; +Cc: intel-gfx
On Fri, 14 Dec 2012 00:00:07 +0100
Daniel Vetter <daniel@ffwll.ch> wrote:
> On Thu, Dec 13, 2012 at 11:47:47PM +0800, Zhenyu Wang wrote:
> > 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: Zhenyu Wang <zhenyuw@linux.intel.com>
>
> Nice catch! Thanks for the patch, merged to -fixes for 3.8.
> -Daniel
dmar. can't live with it, can live without it
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-12-14 5:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-13 15:47 [PATCH] drm/i915: Fix missed needs_dmar setting Zhenyu Wang
2012-12-13 23:00 ` Daniel Vetter
2012-12-14 5:40 ` Ben Widawsky
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.