1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/i915_request.h b/drivers/gpu/drm/i915/i915_request.h
index eddbd4245cb3..7ee220ded9c9 100644
--- a/drivers/gpu/drm/i915/i915_request.h
+++ b/drivers/gpu/drm/i915/i915_request.h
@@ -93,8 +93,9 @@ struct i915_request {
          * i915_request_free() will then decrement the refcount on the
          * context.
          */
-        struct i915_gem_context *ctx;
+        struct i915_gem_context *gem_context;
         struct intel_engine_cs *engine;
+        struct intel_context *hw_context;
         struct intel_ring *ring;
         struct i915_timeline *timeline;
         struct intel_signal_node signaling;
@@ -133,6 +134,9 @@ struct i915_request {
         /** Position in the ring of the start of the request */
         u32 head;
 
+        /** Position in the ring of the start of the user packets */
+        u32 infix;
+
         /**
          * Position in the ring of the start of the postfix.
          * This is required to calculate the maximum available ring space
@@ -249,9 +253,7 @@ int i915_request_await_object(struct i915_request *to,
 int i915_request_await_dma_fence(struct i915_request *rq,
                                  struct dma_fence *fence);
 
-void __i915_request_add(struct i915_request *rq, bool flush_caches);
-#define i915_request_add(rq) \
-        __i915_request_add(rq, false)
+void i915_request_add(struct i915_request *rq);
 
 void __i915_request_submit(struct i915_request *request);
 void i915_request_submit(struct i915_request *request);
@@ -266,6 +268,7 @@ long i915_request_wait(struct i915_request *rq,
 #define I915_WAIT_INTERRUPTIBLE BIT(0)
 #define I915_WAIT_LOCKED        BIT(1) /* struct_mutex held, handle GPU reset */
 #define I915_WAIT_ALL           BIT(2) /* used by i915_gem_object_wait() */
+#define I915_WAIT_FOR_IDLE_BOOST BIT(3)
 
 static inline u32 intel_engine_get_seqno(struct intel_engine_cs *engine);