Commit 48bf5b2d authored Dec 27, 2014 by Chris Wilson Committed by Jani Nikula Jan 12, 2015

drm/i915: Ban Haswell from using RCS flips



Like Ivybridge, we have reports that we get random hangs when flipping
with multiple pipes. Extend

commit 2a92d5bc
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Tue Jul 8 10:40:29 2014 +0100

    drm/i915: Disable RCS flips on Ivybridge

to also apply to Haswell.

Reported-and-tested-by: Scott Tsai <scottt.tw@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87759


Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: stable@vger.kernel.org # 2a92d5bc drm/i915: Disable RCS flips on Ivybridge
Cc: stable@vger.kernel.org
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

parent f24eeb19

drivers/gpu/drm/i915/intel_display.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -9815,7 +9815,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
		if (obj->tiling_mode != work->old_fb_obj->tiling_mode)
		/* vlv: DISPLAY_FLIP fails to change tiling */
		ring = NULL;
		} else if (IS_IVYBRIDGE(dev)) {
		} else if (IS_IVYBRIDGE(dev) \|\| IS_HASWELL(dev)) {
		ring = &dev_priv->ring[BCS];
		} else if (INTEL_INFO(dev)->gen >= 7) {
		ring = obj->ring;