Module Name: src
Committed By: riastradh
Date: Sat Feb 28 04:17:37 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_display.c
Log Message:
Simplify wait while cold. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_display.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/intel_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.13 src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.14
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.13 Thu Nov 6 12:47:48 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Sat Feb 28 04:17:37 2015
@@ -3131,9 +3131,6 @@ static void intel_crtc_wait_for_pending_
{
struct drm_device *dev = crtc->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
-#ifdef __NetBSD__
- int ret = 0;
-#endif
if (crtc->primary->fb == NULL)
return;
@@ -3141,16 +3138,16 @@ static void intel_crtc_wait_for_pending_
#ifdef __NetBSD__
if (cold) {
unsigned timo = 1000;
- ret = 0;
while (!intel_crtc_has_pending_flip(crtc)) {
- if (timo-- == 0) {
- ret = -ETIMEDOUT;
+ if (timo-- == 0)
+ /* Give up. */
break;
- }
DELAY(10);
}
} else {
unsigned long flags;
+ int ret;
+
spin_lock_irqsave(&dev_priv->pending_flip_lock, flags);
WARN_ON(DRM_SPIN_WAITERS_P(&dev_priv->pending_flip_queue,
&dev_priv->pending_flip_lock));
