drm/i915: Move request->ctx aside

In the next patch, we want to store the intel_context pointer inside
i915_request, as it is frequently access via a convoluted dance when
submitting the request to hw. Having two context pointers inside
i915_request leads to confusion so first rename the existing
i915_gem_context pointer to i915_request.gem_context.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180517212633.24934-1-chris@chris-wilson.co.uk

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c
index 637e852888ec..a432a193f3c4 100644
--- a/drivers/gpu/drm/i915/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/intel_guc_submission.c
@@ -513,8 +513,9 @@ static void guc_add_request(struct intel_guc *guc, struct i915_request *rq)
 {
         struct intel_guc_client *client = guc->execbuf_client;
         struct intel_engine_cs *engine = rq->engine;
-        u32 ctx_desc = lower_32_bits(intel_lr_context_descriptor(rq->ctx,
-                                                                 engine));
+        u32 ctx_desc =
+                lower_32_bits(intel_lr_context_descriptor(rq->gem_context,
+                                                          engine));
         u32 ring_tail = intel_ring_set_tail(rq->ring, rq->tail) / sizeof(u64);
 
         spin_lock(&client->wq_lock);
@@ -725,7 +726,7 @@ static bool __guc_dequeue(struct intel_engine_cs *engine)
                 struct i915_request *rq, *rn;
 
                 list_for_each_entry_safe(rq, rn, &p->requests, sched.link) {
-                        if (last && rq->ctx != last->ctx) {
+                        if (last && rq->gem_context != last->gem_context) {
                                 if (port == last_port) {
                                         __list_del_many(&p->requests,
                                                         &rq->sched.link);