diff options
| author | Daniel Vetter | 2014-03-26 23:42:53 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-03-31 10:45:34 +0200 |
| commit | fcc9fe1a5ad2b826c6ac58c03cdc0cf17a63c7a1 (patch) | |
| tree | 8b74815b2af276870dc45e9afe9ea063790aea6e /drivers/gpu/drm/i915/i915_gem_stolen.c | |
| parent | Merge tag 'v3.14' into drm-intel-next-queued (diff) | |
| download | kernel-qcow2-linux-fcc9fe1a5ad2b826c6ac58c03cdc0cf17a63c7a1.tar.gz kernel-qcow2-linux-fcc9fe1a5ad2b826c6ac58c03cdc0cf17a63c7a1.tar.xz kernel-qcow2-linux-fcc9fe1a5ad2b826c6ac58c03cdc0cf17a63c7a1.zip | |
drm/i915: restrict vt-d stolen memory workaround to pre-gen8
We want future generations to at least attempt to use all features, so
restrict the stolen memory disabling when vt-d is enabled to the
latest generation we have reports for. Which is a HSW per the original
report.
Also once we get a bit a hold of some of the mysterious framebuffer in
stolen memory issues that still haunt bugzilla, we should probably
drop this hack again and see what happens.
This was introduced in
commit 0f4706d2740f2a221cd502922b22e522009041d9
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue Mar 18 14:50:50 2014 +0200
drm/i915: Disable stolen memory when DMAR is active
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: David Woodhouse <dwmw2@infradead.org>
References: https://bugs.freedesktop.org/show_bug.cgi?id=68535
Acked-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_stolen.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_stolen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index 28d24caa49f3..62ef55ba061c 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c @@ -215,7 +215,7 @@ int i915_gem_init_stolen(struct drm_device *dev) int bios_reserved = 0; #ifdef CONFIG_INTEL_IOMMU - if (intel_iommu_gfx_mapped) { + if (intel_iommu_gfx_mapped && INTEL_INFO(dev)->gen < 8) { DRM_INFO("DMAR active, disabling use of stolen memory\n"); return 0; } |