[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Work around bug on one-p...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1b120adbd0e2
branches:  trunk
changeset: 796943:1b120adbd0e2
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri Jun 27 19:55:20 2014 +0000

description:
Work around bug on one-pipe 845 devices until we update drm again.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_irq.c |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (13 lines):

diff -r 0dbb5fbdecb0 -r 1b120adbd0e2 sys/external/bsd/drm2/dist/drm/i915/i915_irq.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c    Fri Jun 27 07:28:26 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c    Fri Jun 27 19:55:20 2014 +0000
@@ -2268,7 +2268,8 @@
                        }
                }
 
-               if (pipe_stats[1] & PIPE_VBLANK_INTERRUPT_STATUS &&
+               if (dev_priv->num_pipe >= 2 &&
+                   pipe_stats[1] & PIPE_VBLANK_INTERRUPT_STATUS &&
                    drm_handle_vblank(dev, 1)) {
                        if (iir & I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT) {
                                intel_prepare_page_flip(dev, 1);