From f7555093b8ea8eb589c335a31674bcd3300c9424 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 28 Oct 2011 10:28:00 -0700 Subject: [PATCH] --- yaml --- r: 275249 b: refs/heads/master c: a08185a3eb658854b29c05bcbfac0f85038ffe9f h: refs/heads/master i: 275247: 4514f041a2d4f63841f60702390c613bf8931149 v: v3 --- [refs] | 2 +- trunk/drivers/char/agp/intel-gtt.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 48a7deed1f04..207e7dc82563 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35b09c9bf619c4fc6040c52dcea6bd5bd6af7679 +refs/heads/master: a08185a3eb658854b29c05bcbfac0f85038ffe9f diff --git a/trunk/drivers/char/agp/intel-gtt.c b/trunk/drivers/char/agp/intel-gtt.c index 3a8d44886010..c92424ca1a55 100644 --- a/trunk/drivers/char/agp/intel-gtt.c +++ b/trunk/drivers/char/agp/intel-gtt.c @@ -1186,10 +1186,11 @@ static void gen6_cleanup(void) /* Certain Gen5 chipsets require require idling the GPU before * unmapping anything from the GTT when VT-d is enabled. */ -extern int intel_iommu_gfx_mapped; 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. @@ -1198,7 +1199,7 @@ static inline int needs_idle_maps(void) gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG) && intel_iommu_gfx_mapped) return 1; - +#endif return 0; }