On Tue, 06 Dec 2022 01:21:00 -0800, Alan Previn wrote:
>
> All other GuC Relay Logging debugfs handles including recent
> additions are under the 'i915/gt/uc/path' so let's also move
> 'guc_log_relay_chan' to its proper home.
>
> Signed-off-by: Alan Previn <alan.previn.teres.ale...@intel.com>
> ---
> drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 ++
> drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 2 +-
> drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c | 2 ++
> 3 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h
> b/drivers/gpu/drm/i915/gt/uc/intel_guc.h
> index bb4dfe707a7d..f5394d12c3dd 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.h
> @@ -41,6 +41,8 @@ struct intel_guc {
> struct intel_guc_slpc slpc;
> /** @capture: the error-state-capture module's data and objects */
> struct intel_guc_state_capture *capture;
> + /** @dbgfs_node: the debugfs path for guc file handles */
> + 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 d019c60d34e8..2f1825f367bf 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
> @@ -552,7 +552,7 @@ static int guc_log_relay_create(struct intel_guc_log *log)
> n_subbufs = intel_guc_log_relay_subbuf_count(log);
>
> guc_log_relay_chan = relay_open("guc_log_relay_chan",
> - 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;
> +
Nit but why touch GuC specific field in UC level function, set it in
intel_guc_debugfs_register?
> intel_gt_debugfs_register_files(root, files, ARRAY_SIZE(files), uc);
>
> intel_guc_debugfs_register(&uc->guc, root);
After moving the line above to intel_guc_debugfs_register, this is:
Reviewed-by: Ashutosh Dixit <ashutosh.di...@intel.com>
