[PATCH 6/6] Check if this ifxes the failure in non MTL machines.
Andi Shyti
andi.shyti at linux.intel.com
Thu Oct 5 19:29:21 UTC 2023
Signed-off-by: Andi Shyti <andi.shyti at linux.intel.com>
---
drivers/gpu/drm/i915/gt/intel_ggtt.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
index be8c216d29f9..1b2fd5b54aac 100644
--- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
@@ -231,11 +231,11 @@ static void guc_ggtt_invalidate(struct i915_ggtt *ggtt)
intel_guc_is_ready(>->uc.guc)) {
guc_ggtt_ct_invalidate(gt);
} else if (GRAPHICS_VER(i915) >= 12) {
- intel_uncore_write(gt->uncore,
+ intel_uncore_write_fw(gt->uncore,
GEN12_GUC_TLB_INV_CR,
GEN12_GUC_TLB_INV_CR_INVALIDATE);
} else {
- intel_uncore_write(gt->uncore,
+ intel_uncore_write_fw(gt->uncore,
GEN8_GTCR, GEN8_GTCR_INVALIDATE);
}
}
@@ -1259,7 +1259,8 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt)
ggtt->vm.raw_insert_page = gen8_ggtt_insert_page;
}
- if (intel_uc_wants_guc_submission(&ggtt->vm.gt->uc))
+ if (intel_uc_wants_guc(&ggtt->vm.gt->uc) &&
+ intel_uc_wants_guc_submission(&ggtt->vm.gt->uc))
ggtt->invalidate = guc_ggtt_invalidate;
else
ggtt->invalidate = gen8_ggtt_invalidate;
--
2.40.1
More information about the Intel-gfx-trybot
mailing list