intel-xe.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3] drm/xe/xe_guc_ads: save/restore OA registers
@ 2024-10-23 20:07 Jonathan Cavitt
  2024-10-24 11:52 ` ✓ CI.Patch_applied: success for drm/xe/xe_guc_ads: save/restore OA registers (rev3) Patchwork
                   ` (10 more replies)
  0 siblings, 11 replies; 22+ messages in thread
From: Jonathan Cavitt @ 2024-10-23 20:07 UTC (permalink / raw)
  To: intel-xe
  Cc: jonathan.cavitt, saurabhg.gupta, alex.zuo, umesh.nerlige.ramappa,
	john.c.harrison, stable

Several OA registers and allowlist registers were missing from the
save/restore list for GuC and could be lost during an engine reset.  Add
them to the list.

v2:
- Fix commit message (Umesh)
- Add missing closes (Ashutosh)

v3:
- Add missing fixes (Ashutosh)

Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/2249
Fixes: dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
Suggested-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Suggested-by: John Harrison <john.c.harrison@intel.com>
Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
CC: stable@vger.kernel.org # v6.11+
Acked-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
---
 drivers/gpu/drm/xe/xe_guc_ads.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/drivers/gpu/drm/xe/xe_guc_ads.c b/drivers/gpu/drm/xe/xe_guc_ads.c
index 4e746ae98888..a196c4fb90fc 100644
--- a/drivers/gpu/drm/xe/xe_guc_ads.c
+++ b/drivers/gpu/drm/xe/xe_guc_ads.c
@@ -15,6 +15,7 @@
 #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"
@@ -740,6 +741,11 @@ 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++) {
@@ -748,6 +754,14 @@ 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.43.0


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

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

Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-23 20:07 [PATCH v3] drm/xe/xe_guc_ads: save/restore OA registers Jonathan Cavitt
2024-10-24 11:52 ` ✓ CI.Patch_applied: success for drm/xe/xe_guc_ads: save/restore OA registers (rev3) Patchwork
2024-10-24 11:52 ` ✓ CI.checkpatch: " Patchwork
2024-10-24 11:53 ` ✓ CI.KUnit: " Patchwork
2024-10-24 12:05 ` ✓ CI.Build: " Patchwork
2024-10-24 12:07 ` ✓ CI.Hooks: " Patchwork
2024-10-24 12:08 ` ✓ CI.checksparse: " Patchwork
2024-10-24 12:30 ` ✗ CI.BAT: failure " Patchwork
2024-10-25  9:19 ` ✗ CI.FULL: " Patchwork
2024-10-28 16:36 ` [PATCH v3] drm/xe/xe_guc_ads: save/restore OA registers Dixit, Ashutosh
2024-10-28 20:38   ` Umesh Nerlige Ramappa
2024-10-28 20:48     ` Dixit, Ashutosh
2024-10-28 22:49 ` Dixit, Ashutosh
2024-10-29 16:23 ` Lucas De Marchi
2024-10-29 17:15   ` Dixit, Ashutosh
2024-10-29 17:32     ` Lucas De Marchi
2024-10-29 19:33       ` Matt Roper
2024-10-29 19:44         ` Dixit, Ashutosh
2024-10-29 19:50           ` Lucas De Marchi
2024-10-29 19:46         ` Lucas De Marchi
2024-10-29 21:19         ` Umesh Nerlige Ramappa
2024-10-29 19:38       ` Dixit, Ashutosh

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).