FAILED: patch "[PATCH] drm/i915/gt: Invalidate TLB of the OA unit at TLB" failed to apply to 5.10-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 180abeb2c5032704787151135b6a38c6b71295a6 Mon Sep 17 00:00:00 2001
From: Chris Wilson <[email protected]>
Date: Wed, 27 Jul 2022 14:29:53 +0200
Subject: [PATCH] drm/i915/gt: Invalidate TLB of the OA unit at TLB
invalidations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Ensure that the TLB of the OA unit is also invalidated on gen12 HW, as just invalidating the TLB of an engine is not enough.
Fixes 7938d61591d3 ("drm/i915: Flush TLBs before releasing backing store")
Signed-off-by Chris Wilson <[email protected]>
Cc Fei Yang <[email protected]>
Reviewed-by Andi Shyti <[email protected]>
Acked-by Tvrtko Ursulin <[email protected]>
Acked-by Thomas Hellström <[email protected]>
Signed-off-by Mauro Carvalho Chehab <[email protected]>
Signed-off-by Andi Shyti <[email protected]>
(cherry picked from commit dfc83de118ff7930acc9a4c8dfdba7c153aa44d6)
Signed-off-by Rodrigo Vivi <[email protected]>
drivers/gpu/drm/i915/gt/intel_gt.c +10 -0
@@ -11,6 +11,7 @@#include "pxp/intel_pxp.h" #include "i915_drv.h" +#include "i915_perf_oa_regs.h" #include "intel_context.h" #include "intel_engine_pm.h" #include "intel_engine_regs.h"
@@ -969,6 +970,15 @@ void intel_gt_invalidate_tlbs(struct intel_gt *gt) awake |= engine->mask; } +/* Wa_2207587034:tgl,dg1,rkl,adl-s,adl-p */ +if (awake && + (IS_TIGERLAKE (i915) || +IS_DG1 (i915) || +IS_ROCKETLAKE (i915) || +IS_ALDERLAKE_S (i915) || +IS_ALDERLAKE_P (i915))) +intel_uncore_write_fw (uncore,GEN12_OA_TLB_INV_CR ,1 ); +spin_unlock_irq (&uncore->lock);for_each_engine_masked (engine, gt, awake, tmp) {