From c619e0a5cb122d730a26a7284d0f3de147c87e5d Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Fri, 3 Dec 2021 20:42:22 -0800 Subject: Updated to 5.15.6 --- 0007-Revert-drm-i915-Implement-Wa_1508744258.patch | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 0007-Revert-drm-i915-Implement-Wa_1508744258.patch (limited to '0007-Revert-drm-i915-Implement-Wa_1508744258.patch') diff --git a/0007-Revert-drm-i915-Implement-Wa_1508744258.patch b/0007-Revert-drm-i915-Implement-Wa_1508744258.patch new file mode 100644 index 0000000..5517ef5 --- /dev/null +++ b/0007-Revert-drm-i915-Implement-Wa_1508744258.patch @@ -0,0 +1,47 @@ +From 2b3efb722d72940a61adb5898d92d8ebacd9e3a8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= +Date: Fri, 19 Nov 2021 06:09:30 -0800 +Subject: [PATCH 7/8] Revert "drm/i915: Implement Wa_1508744258" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This workarounds are causing hangs, because I missed the fact that it +needs to be enabled for all cases and disabled when doing a resolve +pass. + +So KMD only needs to whitelist it and UMD will be the one setting it +on per case. + +This reverts commit 28ec02c9cbebf3feeaf21a59df9dfbc02bda3362. + +Fixes: https://gitlab.freedesktop.org/drm/intel/-/issues/4145 +Signed-off-by: José Roberto de Souza +Fixes: 28ec02c9cbeb ("drm/i915: Implement Wa_1508744258") +Reviewed-by: Matt Atwood +For: https://bugs.archlinux.org/task/72752 +--- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c +index aae609d7d85d..6b5ab19a2ada 100644 +--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c ++++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c +@@ -621,13 +621,6 @@ static void gen12_ctx_workarounds_init(struct intel_engine_cs *engine, + FF_MODE2_GS_TIMER_MASK, + FF_MODE2_GS_TIMER_224, + 0, false); +- +- /* +- * Wa_14012131227:dg1 +- * Wa_1508744258:tgl,rkl,dg1,adl-s,adl-p +- */ +- wa_masked_en(wal, GEN7_COMMON_SLICE_CHICKEN1, +- GEN9_RHWO_OPTIMIZATION_DISABLE); + } + + static void dg1_ctx_workarounds_init(struct intel_engine_cs *engine, +-- +2.33.1 + -- cgit v1.2.1