diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2020-01-26 19:46:18 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-01-27 21:11:59 +0000 |
| commit | 9c6527116e8f292c997b49cd791157b58f0286ac (patch) | |
| tree | e9be84993f8817e6275498c5089195ddd2c30408 /drivers/gpu/drm/i915/gt/intel_gt.c | |
| parent | 909438bbfb567dc21717933d460770e827280605 (diff) | |
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 <chris@chris-wilson.co.uk>
Acked-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200126194618.2131078-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/gt/intel_gt.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_gt.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c index da2b6e2ae692..88b6c904607c 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; } |