Skip to content

Commit 0191fdd

Browse files
ashutoshxmattrope
authored andcommitted
Revert "drm/xe/xe_guc_ads: save/restore OA registers and allowlist regs"
This reverts commit 55858fa. '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: 55858fa ("drm/xe/xe_guc_ads: save/restore OA registers and allowlist regs") Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com> Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com> Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20241029200147.1476513-1-ashutosh.dixit@intel.com
1 parent db38fdb commit 0191fdd

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

drivers/gpu/drm/xe/xe_guc_ads.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "regs/xe_engine_regs.h"
1616
#include "regs/xe_gt_regs.h"
1717
#include "regs/xe_guc_regs.h"
18-
#include "regs/xe_oa_regs.h"
1918
#include "xe_bo.h"
2019
#include "xe_gt.h"
2120
#include "xe_gt_ccs_mode.h"
@@ -741,11 +740,6 @@ static unsigned int guc_mmio_regset_write(struct xe_guc_ads *ads,
741740
guc_mmio_regset_write_one(ads, regset_map, e->reg, count++);
742741
}
743742

744-
for (i = 0; i < RING_MAX_NONPRIV_SLOTS; i++)
745-
guc_mmio_regset_write_one(ads, regset_map,
746-
RING_FORCE_TO_NONPRIV(hwe->mmio_base, i),
747-
count++);
748-
749743
/* Wa_1607983814 */
750744
if (needs_wa_1607983814(xe) && hwe->class == XE_ENGINE_CLASS_RENDER) {
751745
for (i = 0; i < LNCFCMOCS_REG_COUNT; i++) {
@@ -754,14 +748,6 @@ static unsigned int guc_mmio_regset_write(struct xe_guc_ads *ads,
754748
}
755749
}
756750

757-
guc_mmio_regset_write_one(ads, regset_map, EU_PERF_CNTL0, count++);
758-
guc_mmio_regset_write_one(ads, regset_map, EU_PERF_CNTL1, count++);
759-
guc_mmio_regset_write_one(ads, regset_map, EU_PERF_CNTL2, count++);
760-
guc_mmio_regset_write_one(ads, regset_map, EU_PERF_CNTL3, count++);
761-
guc_mmio_regset_write_one(ads, regset_map, EU_PERF_CNTL4, count++);
762-
guc_mmio_regset_write_one(ads, regset_map, EU_PERF_CNTL5, count++);
763-
guc_mmio_regset_write_one(ads, regset_map, EU_PERF_CNTL6, count++);
764-
765751
return count;
766752
}
767753

0 commit comments

Comments
 (0)