drm/i915: Remove one level of indention from wait-for-execute

Now that the code is getting simpler, we can reduce the indentation when
waiting for the global_seqno.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170223074422.4125-17-chris@chris-wilson.co.uk

drivers/gpu/drm/i915/i915_gem_request.c

@@ -1086,32 +1086,29 @@ long i915_wait_request(struct drm_i915_gem_request *req,
 	intel_wait_init(&wait);
 
 restart:
-	if (!intel_wait_update_request(&wait, req)) {
-		do {
-			set_current_state(state);
-
-			if (intel_wait_update_request(&wait, req))
-				break;
+	do {
+		set_current_state(state);
+		if (intel_wait_update_request(&wait, req))
+			break;
 
-			if (flags & I915_WAIT_LOCKED &&
-			    __i915_wait_request_check_and_reset(req))
-				continue;
+		if (flags & I915_WAIT_LOCKED &&
+		    __i915_wait_request_check_and_reset(req))
+			continue;
 
-			if (signal_pending_state(state, current)) {
-				timeout = -ERESTARTSYS;
-				goto complete;
-			}
+		if (signal_pending_state(state, current)) {
+			timeout = -ERESTARTSYS;
+			goto complete;
+		}
 
-			if (!timeout) {
-				timeout = -ETIME;
-				goto complete;
-			}
+		if (!timeout) {
+			timeout = -ETIME;
+			goto complete;
+		}
 
-			timeout = io_schedule_timeout(timeout);
-		} while (1);
+		timeout = io_schedule_timeout(timeout);
+	} while (1);
 
-		GEM_BUG_ON(!intel_wait_has_seqno(&wait));
-	}
+	GEM_BUG_ON(!intel_wait_has_seqno(&wait));
 	GEM_BUG_ON(!i915_sw_fence_signaled(&req->submit));
 
 	/* Optimistic short spin before touching IRQs */