Since request can be unsubmitted, we need to avoid overriding its priority
during submission. Otherwise we won't be able to resubmit it with
correct priority.

Cc: Chris Wilson <[email protected]>
Cc: Joonas Lahtinen <[email protected]>
Cc: Tvrtko Ursulin <[email protected]>
Signed-off-by: Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/i915_guc_submission.c | 1 -
 drivers/gpu/drm/i915/intel_lrc.c           | 1 -
 2 files changed, 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c 
b/drivers/gpu/drm/i915/i915_guc_submission.c
index 6193ad7..082f8ae 100644
--- a/drivers/gpu/drm/i915/i915_guc_submission.c
+++ b/drivers/gpu/drm/i915/i915_guc_submission.c
@@ -692,7 +692,6 @@ static bool i915_guc_dequeue(struct intel_engine_cs *engine)
                rb = rb_next(rb);
                rb_erase(&rq->priotree.node, &engine->execlist_queue);
                RB_CLEAR_NODE(&rq->priotree.node);
-               rq->priotree.priority = INT_MAX;
 
                i915_guc_submit(rq);
                trace_i915_gem_request_in(rq, port - engine->execlist_port);
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index b0c3a02..301ae7c 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -488,7 +488,6 @@ static void execlists_dequeue(struct intel_engine_cs 
*engine)
                rb = rb_next(rb);
                rb_erase(&cursor->priotree.node, &engine->execlist_queue);
                RB_CLEAR_NODE(&cursor->priotree.node);
-               cursor->priotree.priority = INT_MAX;
 
                __i915_gem_request_submit(cursor);
                trace_i915_gem_request_in(cursor, port - engine->execlist_port);
-- 
2.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to