summaryrefslogtreecommitdiff
path: root/drivers/char/agp
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-04-02 10:08:35 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-04-02 15:59:07 +0200
commit650dc07ec3b0eba8ff21da706d2b1876ada59fc3 (patch)
tree337809fc7c960a6c525f473d498c339aa7075ab3 /drivers/char/agp
parentcc22a938fc1db0c8ef5e693a69b159c4b851dab3 (diff)
downloadlinux-3.10-650dc07ec3b0eba8ff21da706d2b1876ada59fc3.tar.gz
linux-3.10-650dc07ec3b0eba8ff21da706d2b1876ada59fc3.tar.bz2
linux-3.10-650dc07ec3b0eba8ff21da706d2b1876ada59fc3.zip
drm/i915: disable ppgtt on snb when dmar is enabled
Totally unexpected that this regressed. Luckily it sounds like we just need to have dmar disable on the igfx, not the entire system. At least that's what a few days of testing between Tony Vroon and me indicates. Reported-by: Tony Vroon <tony@linx.net> Cc: Tony Vroon <tony@linx.net> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=43024 Acked-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/char/agp')
-rw-r--r--drivers/char/agp/intel-gtt.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index f493546b2d4..7f025fb620d 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -1190,7 +1190,6 @@ static inline int needs_idle_maps(void)
{
#ifdef CONFIG_INTEL_IOMMU
const unsigned short gpu_devid = intel_private.pcidev->device;
- extern int intel_iommu_gfx_mapped;
/* Query intel_iommu to see if we need the workaround. Presumably that
* was loaded first.