From 0398c68b9a47c12b6e6719306fbbd470837249cb Mon Sep 17 00:00:00 2001 From: jsg Date: Fri, 22 Jul 2022 06:06:27 +0000 Subject: [PATCH] drm/i915/dg2: Add Wa_22011100796 From Bruce Chang f8ba02531476196f44a486df178b4f1fec178234 in linux 5.15.y/5.15.56 154cfae6158141b18d65abb0db679bb51a8294e7 in mainline linux --- sys/dev/pci/drm/i915/gt/intel_reset.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/dev/pci/drm/i915/gt/intel_reset.c b/sys/dev/pci/drm/i915/gt/intel_reset.c index d641ff512c7..c6ff3151ef7 100644 --- a/sys/dev/pci/drm/i915/gt/intel_reset.c +++ b/sys/dev/pci/drm/i915/gt/intel_reset.c @@ -623,6 +623,15 @@ static int gen8_reset_engines(struct intel_gt *gt, */ } + /* + * Wa_22011100796:dg2, whenever Full soft reset is required, + * reset all individual engines firstly, and then do a full soft reset. + * + * This is best effort, so ignore any error from the initial reset. + */ + if (IS_DG2(gt->i915) && engine_mask == ALL_ENGINES) + gen11_reset_engines(gt, gt->info.engine_mask, 0); + if (GRAPHICS_VER(gt->i915) >= 11) ret = gen11_reset_engines(gt, engine_mask, retry); else -- 2.20.1