drm/i915: Update init_context() to take a request structure

Now that everything above has been converted to use requests, it is possible to
update init_context() to take a request pointer instead of a ring/context pair.

For: VIZ-5115
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Tomas Elf <tomas.elf@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 13eab1757972..1b9b2c060533 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -742,16 +742,15 @@ static int intel_ring_workarounds_emit(struct intel_engine_cs *ring,
         return 0;
 }
 
-static int intel_rcs_ctx_init(struct intel_engine_cs *ring,
-                              struct intel_context *ctx)
+static int intel_rcs_ctx_init(struct drm_i915_gem_request *req)
 {
         int ret;
 
-        ret = intel_ring_workarounds_emit(ring, ctx);
+        ret = intel_ring_workarounds_emit(req->ring, req->ctx);
         if (ret != 0)
                 return ret;
 
-        ret = i915_gem_render_state_init(ring);
+        ret = i915_gem_render_state_init(req->ring);
         if (ret)
                 DRM_ERROR("init render state: %d\n", ret);