[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Simplify wait while cold...

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

details:   https://anonhg.NetBSD.org/src/rev/5748d7560527
branches:  trunk
changeset: 806539:5748d7560527
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Feb 28 04:17:37 2015 +0000

description:
Simplify wait while cold.  No functional change.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_display.c |  11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diffs (34 lines):

diff -r 61f6552fab16 -r 5748d7560527 sys/external/bsd/drm2/dist/drm/i915/intel_display.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_display.c       Sat Feb 28 03:33:22 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_display.c       Sat Feb 28 04:17:37 2015 +0000
@@ -3131,9 +3131,6 @@
 {
        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 @@
 #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));