From: Greg Kroah-Hartman Date: Sat, 7 Dec 2024 06:35:06 +0000 (+0100) Subject: 6.12-stable patches X-Git-Tag: v6.6.64~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18139e0397eb0984de4d02c65b2c42805cf896d3;p=thirdparty%2Fkernel%2Fstable-queue.git 6.12-stable patches added patches: revert-drm-xe-xe_guc_ads-save-restore-oa-registers-and-allowlist-regs.patch --- diff --git a/queue-6.12/revert-drm-xe-xe_guc_ads-save-restore-oa-registers-and-allowlist-regs.patch b/queue-6.12/revert-drm-xe-xe_guc_ads-save-restore-oa-registers-and-allowlist-regs.patch new file mode 100644 index 00000000000..aeabb334265 --- /dev/null +++ b/queue-6.12/revert-drm-xe-xe_guc_ads-save-restore-oa-registers-and-allowlist-regs.patch @@ -0,0 +1,63 @@ +From 0191fddf53748cf2b473d78faeabe6dcb47689d2 Mon Sep 17 00:00:00 2001 +From: Ashutosh Dixit +Date: Tue, 29 Oct 2024 13:01:47 -0700 +Subject: Revert "drm/xe/xe_guc_ads: save/restore OA registers and allowlist regs" + +From: Ashutosh Dixit + +commit 0191fddf53748cf2b473d78faeabe6dcb47689d2 upstream. + +This reverts commit 55858fa7eb2f163f7aa34339fd3399ba4ff564c6. + +'55858fa7eb2f ("drm/xe/xe_guc_ads: save/restore OA registers and allowlist +regs")' was not properly reviewed and also causes dmesg asserts in +CI. Revert it. + +Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/3295 +Fixes: 55858fa7eb2f ("drm/xe/xe_guc_ads: save/restore OA registers and allowlist regs") +Signed-off-by: Ashutosh Dixit +Reviewed-by: Jonathan Cavitt +Signed-off-by: Matt Roper +Link: https://patchwork.freedesktop.org/patch/msgid/20241029200147.1476513-1-ashutosh.dixit@intel.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/xe/xe_guc_ads.c | 14 -------------- + 1 file changed, 14 deletions(-) + +--- a/drivers/gpu/drm/xe/xe_guc_ads.c ++++ b/drivers/gpu/drm/xe/xe_guc_ads.c +@@ -13,7 +13,6 @@ + #include "regs/xe_engine_regs.h" + #include "regs/xe_gt_regs.h" + #include "regs/xe_guc_regs.h" +-#include "regs/xe_oa_regs.h" + #include "xe_bo.h" + #include "xe_gt.h" + #include "xe_gt_ccs_mode.h" +@@ -602,11 +601,6 @@ static unsigned int guc_mmio_regset_writ + guc_mmio_regset_write_one(ads, regset_map, e->reg, count++); + } + +- for (i = 0; i < RING_MAX_NONPRIV_SLOTS; i++) +- guc_mmio_regset_write_one(ads, regset_map, +- RING_FORCE_TO_NONPRIV(hwe->mmio_base, i), +- count++); +- + /* Wa_1607983814 */ + if (needs_wa_1607983814(xe) && hwe->class == XE_ENGINE_CLASS_RENDER) { + for (i = 0; i < LNCFCMOCS_REG_COUNT; i++) { +@@ -615,14 +609,6 @@ static unsigned int guc_mmio_regset_writ + } + } + +- guc_mmio_regset_write_one(ads, regset_map, EU_PERF_CNTL0, count++); +- guc_mmio_regset_write_one(ads, regset_map, EU_PERF_CNTL1, count++); +- guc_mmio_regset_write_one(ads, regset_map, EU_PERF_CNTL2, count++); +- guc_mmio_regset_write_one(ads, regset_map, EU_PERF_CNTL3, count++); +- guc_mmio_regset_write_one(ads, regset_map, EU_PERF_CNTL4, count++); +- guc_mmio_regset_write_one(ads, regset_map, EU_PERF_CNTL5, count++); +- guc_mmio_regset_write_one(ads, regset_map, EU_PERF_CNTL6, count++); +- + return count; + } + diff --git a/queue-6.12/series b/queue-6.12/series index b34df0c7e56..a2520e3f4d4 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -144,3 +144,4 @@ drm-amd-display-fix-handling-of-plane-refcount.patch drm-amd-display-update-pipe-selection-policy-to-check-head-pipe.patch drm-amd-display-remove-pipe_dto_src_sel-programming-from-set_dtbclk_dto.patch posix-timers-target-group-sigqueue-to-current-task-only-if-not-exiting.patch +revert-drm-xe-xe_guc_ads-save-restore-oa-registers-and-allowlist-regs.patch