1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 97b86a55e138..d2ba315f4c92 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2574,11 +2574,13 @@ static void i915_gem_free_request(struct drm_i915_gem_request *request)
         list_del(&request->list);
         i915_gem_request_remove_from_client(request);
 
-        if (i915.enable_execlists && ctx) {
-                struct intel_engine_cs *ring = request->ring;
+        if (ctx) {
+                if (i915.enable_execlists) {
+                        struct intel_engine_cs *ring = request->ring;
 
-                if (ctx != ring->default_context)
-                        intel_lr_context_unpin(ring, ctx);
+                        if (ctx != ring->default_context)
+                                intel_lr_context_unpin(ring, ctx);
+                }
                 i915_gem_context_unreference(ctx);
         }
         kfree(request);