Merge tag 'v3.14' into drm-intel-next-queued

[deliverable/linux.git] / drivers / gpu / drm / i915 / i915_gem_context.c

diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index ce41cff843466291582aeaed583ded996fba213c..6043062ffce73477231fc053113b9eb8bce12607 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -215,6 +215,7 @@ create_vm_for_ctx(struct drm_device *dev, struct i915_hw_context *ctx)
                return ERR_PTR(ret);
        }
 
+       ppgtt->ctx = ctx;
        return ppgtt;
 }
 
@@ -775,9 +776,11 @@ int i915_switch_context(struct intel_ring_buffer *ring,
 
        BUG_ON(file && to == NULL);
 
-       /* We have the fake context, but don't supports switching. */
-       if (!HAS_HW_CONTEXTS(ring->dev))
+       /* We have the fake context */
+       if (!HAS_HW_CONTEXTS(ring->dev)) {
+               ring->last_context = to;
                return 0;
+       }
 
        return do_switch(ring, to);
 }