From: Aradhya Bhatia <aradhya.bhatia@intel.com>
To: Matt Roper <matthew.d.roper@intel.com>
Cc: Intel XE List <intel-xe@lists.freedesktop.org>,
Tejas Upadhyay <tejas.upadhyay@intel.com>,
Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>,
Aradhya Bhatia <aradhya.bhatia@intel.com>
Subject: [PATCH] drm/xe/guc: Make creation of SLPC debugfs files conditional
Date: Thu, 15 May 2025 09:49:12 +0000 [thread overview]
Message-ID: <20250515094913.2437-1-aradhya.bhatia@intel.com> (raw)
Platforms that do not support SLPC are exempted from the GuC PC support.
The GuC PC does not get initialized, and neither do its BOs get created.
This causes a problem because the GuC PC debugfs file is still being
created. Whenever the file is attempted to read, it causes a NULL
pointer dereference on the supposed BO of the GuC PC.
So, make the creation of SLPC debugfs files conditional to when SLPC
features are supported.
Suggested-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Aradhya Bhatia <aradhya.bhatia@intel.com>
---
drivers/gpu/drm/xe/xe_guc_debugfs.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_guc_debugfs.c b/drivers/gpu/drm/xe/xe_guc_debugfs.c
index f33013f8a0f3..0b102ab46c4d 100644
--- a/drivers/gpu/drm/xe/xe_guc_debugfs.c
+++ b/drivers/gpu/drm/xe/xe_guc_debugfs.c
@@ -113,23 +113,34 @@ static const struct drm_info_list vf_safe_debugfs_list[] = {
{ "guc_ctb", .show = guc_debugfs_show, .data = guc_ctb },
};
+/* For GuC debugfs files that require the SLPC support */
+static const struct drm_info_list slpc_debugfs_list[] = {
+ { "guc_pc", .show = guc_debugfs_show, .data = guc_pc },
+};
+
/* everything else should be added here */
static const struct drm_info_list pf_only_debugfs_list[] = {
{ "guc_log", .show = guc_debugfs_show, .data = guc_log },
{ "guc_log_dmesg", .show = guc_debugfs_show, .data = guc_log_dmesg },
- { "guc_pc", .show = guc_debugfs_show, .data = guc_pc },
};
void xe_guc_debugfs_register(struct xe_guc *guc, struct dentry *parent)
{
- struct drm_minor *minor = guc_to_xe(guc)->drm.primary;
+ struct xe_device *xe = guc_to_xe(guc);
+ struct drm_minor *minor = xe->drm.primary;
drm_debugfs_create_files(vf_safe_debugfs_list,
ARRAY_SIZE(vf_safe_debugfs_list),
parent, minor);
- if (!IS_SRIOV_VF(guc_to_xe(guc)))
+ if (!IS_SRIOV_VF(xe)) {
drm_debugfs_create_files(pf_only_debugfs_list,
ARRAY_SIZE(pf_only_debugfs_list),
parent, minor);
+
+ if (!xe->info.skip_guc_pc)
+ drm_debugfs_create_files(slpc_debugfs_list,
+ ARRAY_SIZE(slpc_debugfs_list),
+ parent, minor);
+ }
}
base-commit: 3d6670fab64cb00b5e6ed80d2517147db533faf1
--
2.43.0
next reply other threads:[~2025-05-15 9:49 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-15 9:49 Aradhya Bhatia [this message]
2025-05-15 9:54 ` ✓ CI.Patch_applied: success for drm/xe/guc: Make creation of SLPC debugfs files conditional Patchwork
2025-05-15 9:55 ` ✓ CI.checkpatch: " Patchwork
2025-05-15 9:57 ` ✓ CI.KUnit: " Patchwork
2025-05-15 10:07 ` ✓ CI.Build: " Patchwork
2025-05-15 10:09 ` ✓ CI.Hooks: " Patchwork
2025-05-15 10:11 ` ✓ CI.checksparse: " Patchwork
2025-05-15 10:42 ` ✓ Xe.CI.BAT: " Patchwork
2025-05-15 13:16 ` [PATCH] " Upadhyay, Tejas
2025-05-15 17:36 ` Aradhya Bhatia
2025-05-15 18:37 ` Summers, Stuart
2025-05-16 5:07 ` Aradhya Bhatia
2025-05-16 5:42 ` Upadhyay, Tejas
2025-05-15 19:27 ` ✗ Xe.CI.Full: failure for " 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=20250515094913.2437-1-aradhya.bhatia@intel.com \
--to=aradhya.bhatia@intel.com \
--cc=himal.prasad.ghimiray@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=matthew.d.roper@intel.com \
--cc=tejas.upadhyay@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox