diff options
| author | David S. Miller | 2011-12-30 19:04:14 +0100 |
|---|---|---|
| committer | David S. Miller | 2011-12-30 19:04:14 +0100 |
| commit | 7f8e3234c5f7fbdb06be050c8a1907e9c36d7c61 (patch) | |
| tree | d6e9edb2087fa4a97b2cc3d585a0189672a14cf4 /drivers/gpu/drm/i915/intel_display.c | |
| parent | ipv6: Fix neigh lookup using NULL device. (diff) | |
| parent | Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/j... (diff) | |
| download | kernel-qcow2-linux-7f8e3234c5f7fbdb06be050c8a1907e9c36d7c61.tar.gz kernel-qcow2-linux-7f8e3234c5f7fbdb06be050c8a1907e9c36d7c61.tar.xz kernel-qcow2-linux-7f8e3234c5f7fbdb06be050c8a1907e9c36d7c61.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index d809b038ca88..daa5743ccbd6 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; |