1 files changed, 10 insertions, 29 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index f3e84c44d009..48afa777e94a 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -135,8 +135,7 @@ static int get_context_size(struct drm_device *dev)
 
 void i915_gem_context_free(struct kref *ctx_ref)
 {
-        struct intel_context *ctx = container_of(ctx_ref,
-                                                 typeof(*ctx), ref);
+        struct intel_context *ctx = container_of(ctx_ref, typeof(*ctx), ref);
 
         trace_i915_context_free(ctx);
 
@@ -195,6 +194,7 @@ __create_hw_context(struct drm_device *dev,
 
         kref_init(&ctx->ref);
         list_add_tail(&ctx->link, &dev_priv->context_list);
+        ctx->i915 = dev_priv;
 
         if (dev_priv->hw_context_size) {
                 struct drm_i915_gem_object *obj =
@@ -573,20 +573,12 @@ static inline bool should_skip_switch(struct intel_engine_cs *ring,
                                       struct intel_context *from,
                                       struct intel_context *to)
 {
-        struct drm_i915_private *dev_priv = ring->dev->dev_private;
-
         if (to->remap_slice)
                 return false;
 
-        if (to->ppgtt) {
-                if (from == to && !test_bit(ring->id,
-                                &to->ppgtt->pd_dirty_rings))
-                        return true;
-        } else if (dev_priv->mm.aliasing_ppgtt) {
-                if (from == to && !test_bit(ring->id,
-                                &dev_priv->mm.aliasing_ppgtt->pd_dirty_rings))
-                        return true;
-        }
+        if (to->ppgtt && from == to &&
+            !(intel_ring_flag(ring) & to->ppgtt->pd_dirty_rings))
+                return true;
 
         return false;
 }
@@ -636,7 +628,6 @@ static int do_switch(struct intel_engine_cs *ring,
         struct intel_context *from = ring->last_context;
         u32 hw_flags = 0;
         bool uninitialized = false;
-        struct i915_vma *vma;
         int ret, i;
 
         if (from != NULL && ring == &dev_priv->ring[RCS]) {
@@ -673,7 +664,7 @@ static int do_switch(struct intel_engine_cs *ring,
                         goto unpin_out;
 
                 /* Doing a PD load always reloads the page dirs */
-                clear_bit(ring->id, &to->ppgtt->pd_dirty_rings);
+                to->ppgtt->pd_dirty_rings &= ~intel_ring_flag(ring);
         }
 
         if (ring != &dev_priv->ring[RCS]) {
@@ -694,16 +685,6 @@ static int do_switch(struct intel_engine_cs *ring,
         if (ret)
                 goto unpin_out;
 
-        vma = i915_gem_obj_to_ggtt(to->legacy_hw_ctx.rcs_state);
-        if (!(vma->bound & GLOBAL_BIND)) {
-                ret = i915_vma_bind(vma,
-                                    to->legacy_hw_ctx.rcs_state->cache_level,
-                                    GLOBAL_BIND);
-                /* This shouldn't ever fail. */
-                if (WARN_ONCE(ret, "GGTT context bind failed!"))
-                        goto unpin_out;
-        }
-
         if (!to->legacy_hw_ctx.initialized) {
                 hw_flags |= MI_RESTORE_INHIBIT;
                 /* NB: If we inhibit the restore, the context is not allowed to
@@ -711,12 +692,14 @@ static int do_switch(struct intel_engine_cs *ring,
                  * space. This means we must enforce that a page table load
                  * occur when this occurs. */
         } else if (to->ppgtt &&
-                        test_and_clear_bit(ring->id, &to->ppgtt->pd_dirty_rings))
+                   (intel_ring_flag(ring) & to->ppgtt->pd_dirty_rings)) {
                 hw_flags |= MI_FORCE_RESTORE;
+                to->ppgtt->pd_dirty_rings &= ~intel_ring_flag(ring);
+        }
 
         /* We should never emit switch_mm more than once */
         WARN_ON(needs_pd_load_pre(ring, to) &&
-                        needs_pd_load_post(ring, to, hw_flags));
+                needs_pd_load_post(ring, to, hw_flags));
 
         ret = mi_set_context(ring, to, hw_flags);
         if (ret)
@@ -768,8 +751,6 @@ static int do_switch(struct intel_engine_cs *ring,
                  * swapped, but there is no way to do that yet.
                  */
                 from->legacy_hw_ctx.rcs_state->dirty = 1;
-                BUG_ON(i915_gem_request_get_ring(
-                        from->legacy_hw_ctx.rcs_state->last_read_req) != ring);
 
                 /* obj is kept alive until the next request by its active ref */
                 i915_gem_object_ggtt_unpin(from->legacy_hw_ctx.rcs_state);