[RFC 01/11] drm/i915/scheduler: Remember request priority throughout its lifetime

Michał Winiarski
2017-02-23T19:09:38Z

Since request can be cancelled, we need to avoid overriding its priority
during submission to be able to resubmit it.

Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
---
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 89ee0f4..2c76377 100644
--- a/drivers/gpu/drm/i915/i915_guc_submission.c
+++ b/drivers/gpu/drm/i915/i915_guc_submission.c
@@ -589,7 +589,6 @@ static bool i915_guc_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_guc_submit(cursor);
last = cursor;
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 6e76d11..d4cfaa1 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -476,7 +476,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);