aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2014-07-08 05:40:29 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-07-08 07:16:02 -0400
commit2a92d5bca1999b69c78f3c3e97b5484985b094b9 (patch)
tree0afe31db419c90e6222dfa979dc56dd3d457d863
parent78382593e921c88371abd019aca8978db3248a8f (diff)
drm/i915: Disable RCS flips on Ivybridge
We currently see random GPU hangs when using RCS flips with multiple pipes on Ivybridge. Now that we have mmio flips, we can fairly cheaply fallback to using CPU driven flips instead. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77104 Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 8043e4b51ecd..8728c8885339 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9658,6 +9658,8 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
9658 9658
9659 if (IS_VALLEYVIEW(dev)) { 9659 if (IS_VALLEYVIEW(dev)) {
9660 ring = &dev_priv->ring[BCS]; 9660 ring = &dev_priv->ring[BCS];
9661 } else if (IS_IVYBRIDGE(dev)) {
9662 ring = &dev_priv->ring[BCS];
9661 } else if (INTEL_INFO(dev)->gen >= 7) { 9663 } else if (INTEL_INFO(dev)->gen >= 7) {
9662 ring = obj->ring; 9664 ring = obj->ring;
9663 if (ring == NULL || ring->id != RCS) 9665 if (ring == NULL || ring->id != RCS)