diff options
| author | Eugeni Dodonov <eugeni.dodonov@intel.com> | 2012-04-13 17:08:54 -0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-04-17 12:22:07 +0200 |
| commit | 83de97c885b633ab6d12346a406911fadeb85f8c (patch) | |
| tree | e8c913962c31016d55cb115c688a0eddff408bcb /drivers/gpu | |
| parent | 0cd83aa9a6aba8fec7d94d4fd5302172e14cebf7 (diff) | |
| download | blackbird-op-linux-83de97c885b633ab6d12346a406911fadeb85f8c.tar.gz blackbird-op-linux-83de97c885b633ab6d12346a406911fadeb85f8c.zip | |
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.c | 4 |
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) 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 */ |
