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

13 files changed, 64 insertions, 55 deletions

diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c
index c2d183b91500..17f9f8d7e148 100644
--- a/drivers/gpu/drm/i915/gvt/scheduler.c
+++ b/drivers/gpu/drm/i915/gvt/scheduler.c
@@ -205,7 +205,7 @@ static int populate_shadow_context(struct intel_vgpu_workload *workload)
 
 static inline bool is_gvt_request(struct i915_request *req)
 {
-        return i915_gem_context_force_single_submission(req->ctx);
+        return i915_gem_context_force_single_submission(req->gem_context);
 }
 
 static void save_ring_hw_state(struct intel_vgpu *vgpu, int ring_id)
@@ -305,7 +305,7 @@ static int copy_workload_to_ring_buffer(struct intel_vgpu_workload *workload)
         struct i915_request *req = workload->req;
 
         if (IS_KABYLAKE(req->i915) &&
-            is_inhibit_context(req->ctx, req->engine->id))
+            is_inhibit_context(req->gem_context, req->engine->id))
                 intel_vgpu_restore_inhibit_context(vgpu, req);
 
         /* allocate shadow ring buffer */
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index d78beaabc051..52515445ac40 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -542,8 +542,8 @@ static int i915_gem_object_info(struct seq_file *m, void *data)
                                                    struct i915_request,
                                                    client_link);
                 rcu_read_lock();
-                task = pid_task(request && request->ctx->pid ?
-                                request->ctx->pid : file->pid,
+                task = pid_task(request && request->gem_context->pid ?
+                                request->gem_context->pid : file->pid,
                                 PIDTYPE_PID);
                 print_file_stats(m, task ? task->comm : "<unknown>", stats);
                 rcu_read_unlock();
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index b0fe452ce17c..a20f8db5729d 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3067,7 +3067,7 @@ static void skip_request(struct i915_request *request)
 static void engine_skip_context(struct i915_request *request)
 {
         struct intel_engine_cs *engine = request->engine;
-        struct i915_gem_context *hung_ctx = request->ctx;
+        struct i915_gem_context *hung_ctx = request->gem_context;
         struct i915_timeline *timeline = request->timeline;
         unsigned long flags;
 
@@ -3077,7 +3077,7 @@ static void engine_skip_context(struct i915_request *request)
         spin_lock_nested(&timeline->lock, SINGLE_DEPTH_NESTING);
 
         list_for_each_entry_continue(request, &engine->timeline.requests, link)
-                if (request->ctx == hung_ctx)
+                if (request->gem_context == hung_ctx)
                         skip_request(request);
 
         list_for_each_entry(request, &timeline->requests, link)
@@ -3123,11 +3123,11 @@ i915_gem_reset_request(struct intel_engine_cs *engine,
         }
 
         if (stalled) {
-                i915_gem_context_mark_guilty(request->ctx);
+                i915_gem_context_mark_guilty(request->gem_context);
                 skip_request(request);
 
                 /* If this context is now banned, skip all pending requests. */
-                if (i915_gem_context_is_banned(request->ctx))
+                if (i915_gem_context_is_banned(request->gem_context))
                         engine_skip_context(request);
         } else {
                 /*
@@ -3137,7 +3137,7 @@ i915_gem_reset_request(struct intel_engine_cs *engine,
                  */
                 request = i915_gem_find_active_request(engine);
                 if (request) {
-                        i915_gem_context_mark_innocent(request->ctx);
+                        i915_gem_context_mark_innocent(request->gem_context);
                         dma_fence_set_error(&request->fence, -EAGAIN);
 
                         /* Rewind the engine to replay the incomplete rq */
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index efb808272460..37c9a42654ba 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -1287,9 +1287,11 @@ static void error_record_engine_registers(struct i915_gpu_state *error,
 static void record_request(struct i915_request *request,
                            struct drm_i915_error_request *erq)
 {
-        erq->context = request->ctx->hw_id;
+        struct i915_gem_context *ctx = request->gem_context;
+
+        erq->context = ctx->hw_id;
         erq->sched_attr = request->sched.attr;
-        erq->ban_score = atomic_read(&request->ctx->ban_score);
+        erq->ban_score = atomic_read(&ctx->ban_score);
         erq->seqno = request->global_seqno;
         erq->jiffies = request->emitted_jiffies;
         erq->start = i915_ggtt_offset(request->ring->vma);
@@ -1297,7 +1299,7 @@ static void record_request(struct i915_request *request,
         erq->tail = request->tail;
 
         rcu_read_lock();
-        erq->pid = request->ctx->pid ? pid_nr(request->ctx->pid) : 0;
+        erq->pid = ctx->pid ? pid_nr(ctx->pid) : 0;
         rcu_read_unlock();
 }
 
@@ -1461,12 +1463,12 @@ static void gem_record_rings(struct i915_gpu_state *error)
 
                 request = i915_gem_find_active_request(engine);
                 if (request) {
+                        struct i915_gem_context *ctx = request->gem_context;
                         struct intel_ring *ring;
 
-                        ee->vm = request->ctx->ppgtt ?
-                                &request->ctx->ppgtt->base : &ggtt->base;
+                        ee->vm = ctx->ppgtt ? &ctx->ppgtt->base : &ggtt->base;
 
-                        record_context(&ee->context, request->ctx);
+                        record_context(&ee->context, ctx);
 
                         /* We need to copy these to an anonymous buffer
                          * as the simplest method to avoid being overwritten
@@ -1483,11 +1485,11 @@ static void gem_record_rings(struct i915_gpu_state *error)
 
                         ee->ctx =
                                 i915_error_object_create(i915,
-                                                         to_intel_context(request->ctx,
+                                                         to_intel_context(ctx,
                                                                           engine)->state);
 
                         error->simulated |=
-                                i915_gem_context_no_error_capture(request->ctx);
+                                i915_gem_context_no_error_capture(ctx);
 
                         ee->rq_head = request->head;
                         ee->rq_post = request->postfix;
diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
index 8928894dd9c7..fe8810a6a339 100644
--- a/drivers/gpu/drm/i915/i915_request.c
+++ b/drivers/gpu/drm/i915/i915_request.c
@@ -384,7 +384,7 @@ static void __retire_engine_request(struct intel_engine_cs *engine,
          */
         if (engine->last_retired_context)
                 intel_context_unpin(engine->last_retired_context, engine);