]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/i915/gt: Skip TLB invalidations once wedged
authorChris Wilson <chris.p.wilson@intel.com>
Wed, 27 Jul 2022 12:29:54 +0000 (14:29 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Aug 2022 09:45:08 +0000 (11:45 +0200)
commit e5a95c83ed1492c0f442b448b20c90c8faaf702b upstream.

Skip all further TLB invalidations once the device is wedged and
had been reset, as, on such cases, it can no longer process instructions
on the GPU and the user no longer has access to the TLB's in each engine.

So, an attempt to do a TLB cache invalidation will produce a timeout.

That helps to reduce the performance regression introduced by TLB
invalidate logic.

Cc: stable@vger.kernel.org
Fixes: 7938d61591d3 ("drm/i915: Flush TLBs before releasing backing store")
Signed-off-by: Chris Wilson <chris.p.wilson@intel.com>
Cc: Fei Yang <fei.yang@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Acked-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/5aa86564b9ec5fe7fe605c1dd7de76855401ed73.1658924372.git.mchehab@kernel.org
(cherry picked from commit be0366f168033374a93e4c43fdaa1a90ab905184)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/i915/gt/intel_gt.c

index d3ddf919ad76502852dad8fab966ac6f633127e3..80a6c3c59176df9898d0b4a47f4ced37a10167dc 100644 (file)
@@ -1191,6 +1191,9 @@ void intel_gt_invalidate_tlbs(struct intel_gt *gt)
        if (I915_SELFTEST_ONLY(gt->awake == -ENODEV))
                return;
 
+       if (intel_gt_is_wedged(gt))
+               return;
+
        if (GRAPHICS_VER(i915) == 12) {
                regs = gen12_regs;
                num = ARRAY_SIZE(gen12_regs);