drm/i915/gt: Move the defer_request waiter active assertion

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / gt / intel_execlists_submission.c

diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
index d9fc953..6fc040d 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@ -1063,7 +1063,6 @@ static void defer_request(struct i915_request *rq, struct list_head * const pl)
                                   __i915_request_has_started(w) &&
                                   !__i915_request_is_complete(rq));
 
-                       GEM_BUG_ON(i915_request_is_active(w));
                        if (!i915_request_is_ready(w))
                                continue;
 
@@ -1071,6 +1070,7 @@ static void defer_request(struct i915_request *rq, struct list_head * const pl)
                                continue;
 
                        GEM_BUG_ON(rq_prio(w) > rq_prio(rq));
+                       GEM_BUG_ON(i915_request_is_active(w));
                        list_move_tail(&w->sched.link, &list);
                }