| Message ID | 20230111235531.3353815-6-radhakrishna.sripada@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Misc Meteorlake patches | expand |
On 11.01.2023 15:55, Radhakrishna Sripada wrote: > From: Andi Shyti <andi.shyti@intel.com> > > In the view of multi-gt we want independent per gt debug files. > > In debugfs create gt0/ gt1/ ... gtN/ for gt related files. In > platforms with 2 gt's, the debugfs would be structured as follows: > > /sys/kernel/debug/dri > └── 0 > ├── gt0 > │ ├── drpc > │ ├── engines > │ ├── forcewake > │ ├── frequency > │ └── rps_boost > └─- gt1 > : ├── drpc > : ├── engines > : ├── forcewake > ├── frequency > └── rps_boost > > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > Signed-off-by: Andi Shyti <andi.shyti@intel.com> > Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> > --- > drivers/gpu/drm/i915/gt/intel_gt_debugfs.c | 4 +++- > drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 ++ > drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 5 ++++- > drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c | 2 ++ > 4 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_debugfs.c b/drivers/gpu/drm/i915/gt/intel_gt_debugfs.c > index 5fc2df01aa0d..4dc23b8d3aa2 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt_debugfs.c > +++ b/drivers/gpu/drm/i915/gt/intel_gt_debugfs.c > @@ -83,11 +83,13 @@ static void gt_debugfs_register(struct intel_gt *gt, struct dentry *root) > void intel_gt_debugfs_register(struct intel_gt *gt) > { > struct dentry *root; > + char gtname[4]; > > if (!gt->i915->drm.primary->debugfs_root) > return; > > - root = debugfs_create_dir("gt", gt->i915->drm.primary->debugfs_root); > + snprintf(gtname, sizeof(gtname), "gt%u", gt->info.id); > + root = debugfs_create_dir(gtname, gt->i915->drm.primary->debugfs_root); > if (IS_ERR(root)) > return; > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc.h > index bb4dfe707a7d..e46aac1a41e6 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.h > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.h > @@ -42,6 +42,8 @@ struct intel_guc { > /** @capture: the error-state-capture module's data and objects */ > struct intel_guc_state_capture *capture; > > + struct dentry *dbgfs_node; > + > /** @sched_engine: Global engine used to submit requests to GuC */ > struct i915_sched_engine *sched_engine; > /** > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c > index 68331c538b0a..71b1f23b64c1 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c > @@ -542,8 +542,11 @@ static int guc_log_relay_create(struct intel_guc_log *log) > */ > n_subbufs = 8; > > + if (!guc->dbgfs_node) > + return -ENOENT; > + > guc_log_relay_chan = relay_open("guc_log", > - dev_priv->drm.primary->debugfs_root, > + guc->dbgfs_node, > subbuf_size, n_subbufs, > &relay_callbacks, dev_priv); > if (!guc_log_relay_chan) { > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c > index 284d6fbc2d08..2f93cc4e408a 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c > @@ -54,6 +54,8 @@ void intel_uc_debugfs_register(struct intel_uc *uc, struct dentry *gt_root) > if (IS_ERR(root)) > return; > > + uc->guc.dbgfs_node = root; > + This hunk is implementing a new change to what is decribed in the commit. It is actually moving the > intel_gt_debugfs_register_files(root, files, ARRAY_SIZE(files), uc); > > intel_guc_debugfs_register(&uc->guc, root); > -- > 2.34.1 >
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_debugfs.c b/drivers/gpu/drm/i915/gt/intel_gt_debugfs.c index 5fc2df01aa0d..4dc23b8d3aa2 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_debugfs.c +++ b/drivers/gpu/drm/i915/gt/intel_gt_debugfs.c @@ -83,11 +83,13 @@ static void gt_debugfs_register(struct intel_gt *gt, struct dentry *root) void intel_gt_debugfs_register(struct intel_gt *gt) { struct dentry *root; + char gtname[4]; if (!gt->i915->drm.primary->debugfs_root) return; - root = debugfs_create_dir("gt", gt->i915->drm.primary->debugfs_root); + snprintf(gtname, sizeof(gtname), "gt%u", gt->info.id); + root = debugfs_create_dir(gtname, gt->i915->drm.primary->debugfs_root); if (IS_ERR(root)) return; diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc.h index bb4dfe707a7d..e46aac1a41e6 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.h @@ -42,6 +42,8 @@ struct intel_guc { /** @capture: the error-state-capture module's data and objects */ struct intel_guc_state_capture *capture; + struct dentry *dbgfs_node; + /** @sched_engine: Global engine used to submit requests to GuC */ struct i915_sched_engine *sched_engine; /** diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c index 68331c538b0a..71b1f23b64c1 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c @@ -542,8 +542,11 @@ static int guc_log_relay_create(struct intel_guc_log *log) */ n_subbufs = 8; + if (!guc->dbgfs_node) + return -ENOENT; + guc_log_relay_chan = relay_open("guc_log", - dev_priv->drm.primary->debugfs_root, + guc->dbgfs_node, subbuf_size, n_subbufs, &relay_callbacks, dev_priv); if (!guc_log_relay_chan) { diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c index 284d6fbc2d08..2f93cc4e408a 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c @@ -54,6 +54,8 @@ void intel_uc_debugfs_register(struct intel_uc *uc, struct dentry *gt_root) if (IS_ERR(root)) return; + uc->guc.dbgfs_node = root; + intel_gt_debugfs_register_files(root, files, ARRAY_SIZE(files), uc); intel_guc_debugfs_register(&uc->guc, root);