From: Ashutosh Dixit <ashutosh.dixit@xxxxxxxxx>
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 <ashutosh.dixit@xxxxxxxxx>
Reviewed-by: Jonathan Cavitt <jonathan.cavitt@xxxxxxxxx>
Signed-off-by: Matt Roper <matthew.d.roper@xxxxxxxxx>
Link: https://patchwork.freedesktop.org/patch/msgid/20241029200147.1476513-1-ashutosh.dixit@xxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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;
}
Patches currently in stable-queue which might be from ashutosh.dixit@xxxxxxxxx are
queue-6.12/revert-drm-xe-xe_guc_ads-save-restore-oa-registers-and-allowlist-regs.patch
queue-6.12/drm-xe-xe_guc_ads-save-restore-oa-registers-and-allowlist-regs.patch
