Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Revert "drm/xe/xe_guc_ads: save/restore OA registers and allowlist regs"
@ 2024-10-29 20:01 Ashutosh Dixit
  2024-10-29 20:11 ` Cavitt, Jonathan
                   ` (8 more replies)
  0 siblings, 9 replies; 12+ messages in thread
From: Ashutosh Dixit @ 2024-10-29 20:01 UTC (permalink / raw)
  To: intel-xe
  Cc: Lucas De Marchi, Jonathan Cavitt, John Harrison,
	Umesh Nerlige Ramappa, Matt Roper

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@intel.com>
---
 drivers/gpu/drm/xe/xe_guc_ads.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_guc_ads.c b/drivers/gpu/drm/xe/xe_guc_ads.c
index a196c4fb90fc9..4e746ae98888f 100644
--- a/drivers/gpu/drm/xe/xe_guc_ads.c
+++ b/drivers/gpu/drm/xe/xe_guc_ads.c
@@ -15,7 +15,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"
@@ -741,11 +740,6 @@ static unsigned int guc_mmio_regset_write(struct xe_guc_ads *ads,
 		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++) {
@@ -754,14 +748,6 @@ static unsigned int guc_mmio_regset_write(struct xe_guc_ads *ads,
 		}
 	}
 
-	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;
 }
 
-- 
2.41.0


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2024-10-30 21:16 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-29 20:01 [PATCH] Revert "drm/xe/xe_guc_ads: save/restore OA registers and allowlist regs" Ashutosh Dixit
2024-10-29 20:11 ` Cavitt, Jonathan
2024-10-29 21:46 ` ✓ CI.Patch_applied: success for " Patchwork
2024-10-29 21:47 ` ✓ CI.checkpatch: " Patchwork
2024-10-29 21:48 ` ✓ CI.KUnit: " Patchwork
2024-10-29 21:59 ` ✓ CI.Build: " Patchwork
2024-10-29 22:02 ` ✓ CI.Hooks: " Patchwork
2024-10-29 22:03 ` ✓ CI.checksparse: " Patchwork
2024-10-29 22:25 ` ✓ CI.BAT: " Patchwork
2024-10-30 19:54   ` Matt Roper
2024-10-30 21:16     ` Dixit, Ashutosh
2024-10-30  2:37 ` ✗ CI.FULL: failure " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox