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

diff --combined drivers/iommu/intel-iommu.c
index a004c39,8dc19b8..bdc447f
--- 1/drivers/iommu/intel-iommu.c
--- 2/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@@ -405,6 -405,9 +405,9 @@@ int dmar_disabled = 0
  int dmar_disabled = 1;
  #endif /*CONFIG_INTEL_IOMMU_DEFAULT_ON*/
  
+ int intel_iommu_enabled = 0;
+ EXPORT_SYMBOL_GPL(intel_iommu_enabled);
+ 
  static int dmar_map_gfx = 1;
  static int dmar_forcedac;
  static int intel_iommu_strict;
@@@ -3524,7 -3527,7 +3527,7 @@@ found
        return 0;
  }
  
 -int dmar_parse_rmrr_atsr_dev(void)
 +int __init dmar_parse_rmrr_atsr_dev(void)
  {
        struct dmar_rmrr_unit *rmrr, *rmrr_n;
        struct dmar_atsr_unit *atsr, *atsr_n;
@@@ -3647,6 -3650,8 +3650,8 @@@ int __init intel_iommu_init(void
  
        bus_register_notifier(&pci_bus_type, &device_nb);
  
+       intel_iommu_enabled = 1;
+ 
        return 0;
  }