diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-16 11:27:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-16 11:27:56 -0800 |
| commit | 2cfab8d74ebfbe06ce2947117945c4f45a5915ec (patch) | |
| tree | 787c8b82533e6f8c358f53ac4aefb2e5e8fd3e2d /include | |
| parent | 5885b9b3f030f9b430f6b1c7fa396c885033f2f8 (diff) | |
| parent | 3b5c78a35cf7511c15e09a9b0ffab290a42d9bcf (diff) | |
| download | linux-3.10-2cfab8d74ebfbe06ce2947117945c4f45a5915ec.tar.gz linux-3.10-2cfab8d74ebfbe06ce2947117945c4f45a5915ec.tar.bz2 linux-3.10-2cfab8d74ebfbe06ce2947117945c4f45a5915ec.zip | |
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~keithp/linux
* 'drm-intel-fixes' of git://people.freedesktop.org/~keithp/linux:
drm/i915/dp: Dither down to 6bpc if it makes the mode fit
drm/i915: enable semaphores on per-device defaults
drm/i915: don't set unpin_work if vblank_get fails
drm/i915: By default, enable RC6 on IVB and SNB when reasonable
iommu: Export intel_iommu_enabled to signal when iommu is in use
drm/i915/sdvo: Include LVDS panels for the IS_DIGITAL check
drm/i915: prevent division by zero when asking for chipset power
drm/i915: add PCH info to i915_capabilities
drm/i915: set the right SDVO transcoder for CPT
drm/i915: no-lvds quirk for ASUS AT5NM10T-I
drm/i915: Treat pre-gen4 backlight duty cycle value consistently
drm/i915: Hook up Ivybridge eDP
drm/i915: add multi-threaded forcewake support
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dma_remapping.h | 2 |
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 |