drm/i915: Reset context image on engines after triggering the reset

[linux.git] / drivers / gpu / drm / i915 / i915_drv.c

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 6b583dc2eb1fa33843c23601220853ec77253d0a..853d6741d3a5b2f9cfbb615a48e56a241d221a52 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1950,6 +1950,8 @@ int i915_reset_engine(struct intel_engine_cs *engine)
                goto out;
        }
 
+       ret = intel_gpu_reset(engine->i915, intel_engine_flag(engine));
+
        /*
         * The request that caused the hang is stuck on elsp, we know the
         * active request and can drop it, adjust head to skip the offending
@@ -1957,9 +1959,6 @@ int i915_reset_engine(struct intel_engine_cs *engine)
         */
        i915_gem_reset_engine(engine, active_request);
 
-       /* Finally, reset just this engine. */
-       ret = intel_gpu_reset(engine->i915, intel_engine_flag(engine));
-
        i915_gem_reset_finish_engine(engine);
 
        if (ret) {