On Fri, 06 Dec 2024 06:37:40 -0800, Greg Kroah-Hartman wrote:
>
Hi Greg,
> 6.12-stable review patch. If anyone has any objections, please let me
> know.
No this patch should *NOT* be added. It was later reverted in:
0191fddf5374 ("Revert "drm/xe/xe_guc_ads: save/restore OA registers and allowlist regs"")
Thanks.
--
Ashutosh
>
> ------------------
>
> From: Jonathan Cavitt <jonathan.cavitt@xxxxxxxxx>
>
> commit 55858fa7eb2f163f7aa34339fd3399ba4ff564c6 upstream.
>
> 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@xxxxxxxxx>
> Suggested-by: John Harrison <john.c.harrison@xxxxxxxxx>
> Signed-off-by: Jonathan Cavitt <jonathan.cavitt@xxxxxxxxx>
> CC: stable@xxxxxxxxxxxxxxx # v6.11+
> Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@xxxxxxxxx>
> Reviewed-by: Ashutosh Dixit <ashutosh.dixit@xxxxxxxxx>
> Signed-off-by: Ashutosh Dixit <ashutosh.dixit@xxxxxxxxx>
> Link: https://patchwork.freedesktop.org/patch/msgid/20241023200716.82624-1-jonathan.cavitt@xxxxxxxxx
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/xe/xe_guc_ads.c | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> --- a/drivers/gpu/drm/xe/xe_guc_ads.c
> +++ b/drivers/gpu/drm/xe/xe_guc_ads.c
> @@ -13,6 +13,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"
> @@ -601,6 +602,11 @@ static unsigned int guc_mmio_regset_writ
> 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++) {
> @@ -609,6 +615,14 @@ static unsigned int guc_mmio_regset_writ
> }
> }
>
> + 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;
> }
>
>
>
