Module Name: src
Committed By: riastradh
Date: Fri Jun 27 19:55:20 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_irq.c
Log Message:
Work around bug on one-pipe 845 devices until we update drm again.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.3 Tue Mar 18 21:36:52 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c Fri Jun 27 19:55:20 2014
@@ -2268,7 +2268,8 @@ static irqreturn_t i8xx_irq_handler(DRM_
}
}
- 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);
