2 files changed, 5 insertions, 7 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index c681dc149d2..b9da8900ae4 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -756,9 +756,9 @@ intel_enable_semaphores(struct drm_device *dev)
         if (i915_semaphores >= 0)
                 return i915_semaphores;
 
-        /* Enable semaphores on SNB when IO remapping is off */
+        /* Disable semaphores on SNB */
         if (INTEL_INFO(dev)->gen == 6)
-                return !intel_iommu_enabled;
+                return 0;
 
         return 1;
 }
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index d809b038ca8..daa5743ccbd 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7922,13 +7922,11 @@ static bool intel_enable_rc6(struct drm_device *dev)
                 return 0;
 
         /*
-         * Enable rc6 on Sandybridge if DMA remapping is disabled
+         * Disable rc6 on Sandybridge
          */
         if (INTEL_INFO(dev)->gen == 6) {
-                DRM_DEBUG_DRIVER("Sandybridge: intel_iommu_enabled %s -- RC6 %sabled\n",
-                                 intel_iommu_enabled ? "true" : "false",
-                                 !intel_iommu_enabled ? "en" : "dis");
-                return !intel_iommu_enabled;
+                DRM_DEBUG_DRIVER("Sandybridge: RC6 disabled\n");
+                return 0;
         }
         DRM_DEBUG_DRIVER("RC6 enabled\n");
         return 1;