From: Chris Wilson Date: Sun, 26 Jan 2020 19:46:18 +0000 (+0000) Subject: drm/i915: Restore the kernel context after verifying the w/a X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9c6527116e8f292c997b49cd791157b58f0286ac;p=linux.git drm/i915: Restore the kernel context after verifying the w/a As a safety net, flush the engine verifications and restore the kernel context. Closes: https://gitlab.freedesktop.org/drm/intel/issues/971 Signed-off-by: Chris Wilson Acked-by: Mika Kuoppala Link: https://patchwork.freedesktop.org/patch/msgid/20200126194618.2131078-1-chris@chris-wilson.co.uk --- diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c index da2b6e2ae6929..88b6c904607cd 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt.c +++ b/drivers/gpu/drm/i915/gt/intel_gt.c @@ -538,6 +538,10 @@ static int __engines_verify_workarounds(struct intel_gt *gt) err = -EIO; } + /* Flush and restore the kernel context for safety */ + if (intel_gt_wait_for_idle(gt, I915_GEM_IDLE_TIMEOUT) == -ETIME) + err = -EIO; + return err; }