Skip to content

Commit 55858fa

Browse files
Jonathan-Cavittashutoshx
authored andcommitted
drm/xe/xe_guc_ads: save/restore OA registers and allowlist regs
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: dd08ebf ("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+ Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com> Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com> Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20241023200716.82624-1-jonathan.cavitt@intel.com
1 parent 85d3f9e commit 55858fa

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

drivers/gpu/drm/xe/xe_guc_ads.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
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"
1819
#include "xe_bo.h"
1920
#include "xe_gt.h"
2021
#include "xe_gt_ccs_mode.h"
@@ -740,6 +741,11 @@ static unsigned int guc_mmio_regset_write(struct xe_guc_ads *ads,
740741
guc_mmio_regset_write_one(ads, regset_map, e->reg, count++);
741742
}
742743

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+
743749
/* Wa_1607983814 */
744750
if (needs_wa_1607983814(xe) && hwe->class == XE_ENGINE_CLASS_RENDER) {
745751
for (i = 0; i < LNCFCMOCS_REG_COUNT; i++) {
@@ -748,6 +754,14 @@ static unsigned int guc_mmio_regset_write(struct xe_guc_ads *ads,
748754
}
749755
}
750756

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+
751765
return count;
752766
}
753767

0 commit comments

Comments
 (0)