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>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c67eb7784aa8c0468f836babc2e99a8931e99084..02e9932c37745f730c8ba0f4af1d4e32b6748712 100644 (file)
--- 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)
        if (INTEL_INFO(dev)->gen == 5)
                return 0;
 
+       /* Sorry Haswell, no RC6 for you for now. */
+       if (IS_HASWELL(dev))
+               return 0;
+
        /*
         * Disable rc6 on Sandybridge
         */