Skip to content
Snippets Groups Projects
Commit 55858fa7 authored by Jonathan Cavitt's avatar Jonathan Cavitt Committed by Ashutosh Dixit
Browse files

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: drm/xe/kernel#2249


Fixes: dd08ebf6 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
Suggested-by: default avatarUmesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Suggested-by: default avatarJohn Harrison <john.c.harrison@intel.com>
Signed-off-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
CC: stable@vger.kernel.org # v6.11+
Reviewed-by: default avatarUmesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Reviewed-by: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241023200716.82624-1-jonathan.cavitt@intel.com
parent 85d3f9e8
No related branches found
No related tags found
No related merge requests found
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "regs/xe_engine_regs.h" #include "regs/xe_engine_regs.h"
#include "regs/xe_gt_regs.h" #include "regs/xe_gt_regs.h"
#include "regs/xe_guc_regs.h" #include "regs/xe_guc_regs.h"
#include "regs/xe_oa_regs.h"
#include "xe_bo.h" #include "xe_bo.h"
#include "xe_gt.h" #include "xe_gt.h"
#include "xe_gt_ccs_mode.h" #include "xe_gt_ccs_mode.h"
...@@ -740,6 +741,11 @@ static unsigned int guc_mmio_regset_write(struct xe_guc_ads *ads, ...@@ -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++); 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 */ /* Wa_1607983814 */
if (needs_wa_1607983814(xe) && hwe->class == XE_ENGINE_CLASS_RENDER) { if (needs_wa_1607983814(xe) && hwe->class == XE_ENGINE_CLASS_RENDER) {
for (i = 0; i < LNCFCMOCS_REG_COUNT; i++) { for (i = 0; i < LNCFCMOCS_REG_COUNT; i++) {
...@@ -748,6 +754,14 @@ static unsigned int guc_mmio_regset_write(struct xe_guc_ads *ads, ...@@ -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; return count;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment