summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni.dodonov@intel.com>2011-11-23 16:42:14 -0200
committerKeith Packard <keithp@keithp.com>2011-12-16 08:49:57 -0800
commit8bc1f85c02a20a59956b00b3acea12c04dce9ae8 (patch)
tree259cc3a7b192afbde9c4b2bf066f0e1a3e4b3999 /include
parent522200858093a6f31af9830672109f6d9807dd1e (diff)
downloadlinux-3.10-8bc1f85c02a20a59956b00b3acea12c04dce9ae8.tar.gz
linux-3.10-8bc1f85c02a20a59956b00b3acea12c04dce9ae8.tar.bz2
linux-3.10-8bc1f85c02a20a59956b00b3acea12c04dce9ae8.zip
iommu: Export intel_iommu_enabled to signal when iommu is in use
In i915 driver, we do not enable either rc6 or semaphores on SNB when dmar is enabled. The new 'intel_iommu_enabled' variable signals when the iommu code is in operation. Cc: Ted Phelps <phelps@gnusto.com> Cc: Peter <pab1612@gmail.com> Cc: Lukas Hejtmanek <xhejtman@fi.muni.cz> Cc: Andrew Lutomirski <luto@mit.edu> CC: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Eugeni Dodonov <eugeni.dodonov@intel.com> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/dma_remapping.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/dma_remapping.h b/include/linux/dma_remapping.h
index ef90cbd8e17..57c9a8ae4f2 100644
--- a/include/linux/dma_remapping.h
+++ b/include/linux/dma_remapping.h
@@ -31,6 +31,7 @@ extern void free_dmar_iommu(struct intel_iommu *iommu);
extern int iommu_calculate_agaw(struct intel_iommu *iommu);
extern int iommu_calculate_max_sagaw(struct intel_iommu *iommu);
extern int dmar_disabled;
+extern int intel_iommu_enabled;
#else
static inline int iommu_calculate_agaw(struct intel_iommu *iommu)
{
@@ -44,6 +45,7 @@ static inline void free_dmar_iommu(struct intel_iommu *iommu)
{
}
#define dmar_disabled (1)
+#define intel_iommu_enabled (0)
#endif