1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 16084749adf5..74a4d587c312 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1827,12 +1827,12 @@ static int ring_request_alloc(struct i915_request *request)
          */
         request->reserved_space += LEGACY_REQUEST_SIZE;
 
-        /* Unconditionally invalidate GPU caches and TLBs. */
-        ret = request->engine->emit_flush(request, EMIT_INVALIDATE);
+        ret = switch_context(request);
         if (ret)
                 return ret;
 
-        ret = switch_context(request);
+        /* Unconditionally invalidate GPU caches and TLBs. */
+        ret = request->engine->emit_flush(request, EMIT_INVALIDATE);
         if (ret)
                 return ret;