1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index 6dbb6f462007..714f3fdd57d2 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -99,13 +99,6 @@ struct intel_ringbuffer {
 
         struct intel_engine_cs *ring;
 
-        /*
-         * FIXME: This backpointer is an artifact of the history of how the
-         * execlist patches came into being. It will get removed once the basic
-         * code has landed.
-         */
-        struct intel_context *FIXME_lrc_ctx;
-
         u32 head;
         u32 tail;
         int space;
@@ -123,6 +116,8 @@ struct intel_ringbuffer {
         u32 last_retired_head;
 };
 
+struct  intel_context;
+
 struct  intel_engine_cs {
         const char      *name;
         enum intel_ring_id {
@@ -239,11 +234,14 @@ struct  intel_engine_cs {
         struct list_head execlist_retired_req_list;
         u8 next_context_status_buffer;
         u32             irq_keep_mask; /* bitmask for interrupts that should not be masked */
-        int             (*emit_request)(struct intel_ringbuffer *ringbuf);
+        int             (*emit_request)(struct intel_ringbuffer *ringbuf,
+                                        struct drm_i915_gem_request *request);
         int             (*emit_flush)(struct intel_ringbuffer *ringbuf,
+                                      struct intel_context *ctx,
                                       u32 invalidate_domains,
                                       u32 flush_domains);
         int             (*emit_bb_start)(struct intel_ringbuffer *ringbuf,
+                                         struct intel_context *ctx,
                                          u64 offset, unsigned flags);
 
         /**