Now that the code is getting simpler, we can reduce the indentation when waiting for the global_seqno.
Signed-off-by: Chris Wilson <[email protected]> --- drivers/gpu/drm/i915/i915_gem_request.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c index bfdb1013da7d..e75edca2e6c3 100644 --- a/drivers/gpu/drm/i915/i915_gem_request.c +++ b/drivers/gpu/drm/i915/i915_gem_request.c @@ -1071,29 +1071,24 @@ long i915_wait_request(struct drm_i915_gem_request *req, wait.tsk = current; restart: - wait.seqno = i915_gem_request_global_seqno(req); - if (!wait.seqno) { - do { - set_current_state(state); - - wait.seqno = i915_gem_request_global_seqno(req); - if (wait.seqno) - break; + do { + set_current_state(state); + wait.seqno = i915_gem_request_global_seqno(req); + if (wait.seqno) + break; - if (flags & I915_WAIT_LOCKED && - __i915_reset_request(req)) - continue; + if (flags & I915_WAIT_LOCKED && __i915_reset_request(req)) + continue; - if (signal_pending_state(state, current)) { - timeout = -ERESTARTSYS; - goto complete; - } + if (signal_pending_state(state, current)) { + timeout = -ERESTARTSYS; + goto complete; + } - timeout = io_schedule_timeout(timeout); - } while (timeout); + timeout = io_schedule_timeout(timeout); + } while (timeout); - GEM_BUG_ON(!wait.seqno); - } + GEM_BUG_ON(!wait.seqno); GEM_BUG_ON(!i915_sw_fence_signaled(&req->submit)); /* Optimistic short spin before touching IRQs */ -- 2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
