aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni.dodonov@intel.com>2012-04-13 16:08:54 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-04-17 06:22:07 -0400
commit83de97c885b633ab6d12346a406911fadeb85f8c (patch)
treee8c913962c31016d55cb115c688a0eddff408bcb /drivers/gpu
parent0cd83aa9a6aba8fec7d94d4fd5302172e14cebf7 (diff)
drm/i915: disable rc6 on haswell for now
This needs proper enablement to avoid machine hangs, so let's just avoid it for now. Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c67eb7784aa8..02e9932c3774 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8585,6 +8585,10 @@ int intel_enable_rc6(const struct drm_device *dev)
8585 if (INTEL_INFO(dev)->gen == 5) 8585 if (INTEL_INFO(dev)->gen == 5)
8586 return 0; 8586 return 0;
8587 8587
8588 /* Sorry Haswell, no RC6 for you for now. */
8589 if (IS_HASWELL(dev))
8590 return 0;
8591
8588 /* 8592 /*
8589 * Disable rc6 on Sandybridge 8593 * Disable rc6 on Sandybridge
8590 */ 8594 */