From: Ashutosh Dixit <ashutosh.dixit@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Lucas De Marchi <lucas.demarchi@intel.com>,
Jonathan Cavitt <jonathan.cavitt@intel.com>,
John Harrison <john.c.harrison@intel.com>,
Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>,
Matt Roper <matthew.d.roper@intel.com>
Subject: [PATCH] Revert "drm/xe/xe_guc_ads: save/restore OA registers and allowlist regs"
Date: Tue, 29 Oct 2024 13:01:47 -0700 [thread overview]
Message-ID: <20241029200147.1476513-1-ashutosh.dixit@intel.com> (raw)
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
next reply other threads:[~2024-10-29 20:02 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-29 20:01 Ashutosh Dixit [this message]
2024-10-29 20:11 ` [PATCH] Revert "drm/xe/xe_guc_ads: save/restore OA registers and allowlist regs" 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241029200147.1476513-1-ashutosh.dixit@intel.com \
--to=ashutosh.dixit@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=john.c.harrison@intel.com \
--cc=jonathan.cavitt@intel.com \
--cc=lucas.demarchi@intel.com \
--cc=matthew.d.roper@intel.com \
--cc=umesh.nerlige.ramappa@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.