| commit | dcb2e993f3c0cecc6c0d905cbf2e428640a957c1 | [log] [tgz] |
|---|---|---|
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | Wed Mar 09 19:07:23 2016 +0200 |
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | Thu Mar 10 13:49:22 2016 +0200 |
| tree | 8e3a5b6740ac5057864f772488f766dd83a725cc | |
| parent | 8b1f165a4a8f64c28cf42d10e1f4d3b451dedc51 [diff] [blame] |
Revert "drm/i915: Enable PSR by default on Valleyview and Cherryview."
This reverts commit a38c274faad0ec6aba692e294ec751d04dbba803.
PSR causes all sorts of vblank wait timeouts and whanot on CHV. Disable
it again.
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Fixes: a38c274faad0 ("drm/i915: Enable PSR by default on Valleyview and Cherryview.")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1457543247-13987-2-git-send-email-ville.syrjala@linux.intel.com
Link: http://patchwork.freedesktop.org/patch/msgid/1457543247-13987-2-git-send-email-ville.syrjala@linux.intel.com
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c index b1413be..38e9518 100644 --- a/drivers/gpu/drm/i915/intel_psr.c +++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -781,8 +781,7 @@ /* Per platform default */ if (i915.enable_psr == -1) { - if (IS_HASWELL(dev) || IS_BROADWELL(dev) || - IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) + if (IS_HASWELL(dev) || IS_BROADWELL(dev)) i915.enable_psr = 1; else i915.enable_psr = 0;