From b4f3e1631f5e8fcfb1da84cbd5d3ec581480954a Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 21 Jul 2017 13:32:20 +0100 Subject: [PATCH] drm/i915: Reset context image on engines after triggering the reset Git-commit: b4f3e1631f5e8fcfb1da84cbd5d3ec581480954a Patch-mainline: v4.14-rc1 References: FATE#322643 bsc#1055900 We try to fixup the context image after the reset to ensure that there are no more pending writes from the hw that may conflict and to fixup any that were in flight. Fixes: a1ef70e14453 ("drm/i915: Add support for per engine reset recovery") Signed-off-by: Chris Wilson Cc: Michel Thierry Cc: Tvrtko Ursulin Cc: Mika Kuoppala Reviewed-by: Mika Kuoppala Link: https://patchwork.freedesktop.org/patch/msgid/20170721123238.16428-2-chris@chris-wilson.co.uk Signed-off-by: Daniel Vetter Acked-by: Takashi Iwai --- drivers/gpu/drm/i915/i915_drv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- 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_engin 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_engin */ 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) {