Commit c4957347 authored by Sean Paul's avatar Sean Paul

drm/msm/dpu: Use provided drm_minor to initialize debugfs

Instead of reaching into dev->primary for debugfs_root, use the minor
passed into debugfs_init.

This avoids creating the debug directory under /sys/kernel/debug/ and
instead creates the directory under the correct node in
/sys/kernel/debug/dri/<node>/
Reported-by: default avatarStephen Boyd <swboyd@chromium.org>
Reviewed-by: default avatarAbhinav Kumar <abhinavk@codeaurora.org>
Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190524173231.5040-1-sean@poorly.run
parent 981f2aab
...@@ -231,7 +231,7 @@ void *dpu_debugfs_create_regset32(const char *name, umode_t mode, ...@@ -231,7 +231,7 @@ void *dpu_debugfs_create_regset32(const char *name, umode_t mode,
regset, &dpu_fops_regset32); regset, &dpu_fops_regset32);
} }
static int _dpu_debugfs_init(struct dpu_kms *dpu_kms) static int _dpu_debugfs_init(struct dpu_kms *dpu_kms, struct drm_minor *minor)
{ {
void *p = dpu_hw_util_get_log_mask_ptr(); void *p = dpu_hw_util_get_log_mask_ptr();
struct dentry *entry; struct dentry *entry;
...@@ -239,7 +239,7 @@ static int _dpu_debugfs_init(struct dpu_kms *dpu_kms) ...@@ -239,7 +239,7 @@ static int _dpu_debugfs_init(struct dpu_kms *dpu_kms)
if (!p) if (!p)
return -EINVAL; return -EINVAL;
entry = debugfs_create_dir("debug", dpu_kms->dev->primary->debugfs_root); entry = debugfs_create_dir("debug", minor->debugfs_root);
if (IS_ERR_OR_NULL(entry)) if (IS_ERR_OR_NULL(entry))
return -ENODEV; return -ENODEV;
...@@ -581,7 +581,7 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms) ...@@ -581,7 +581,7 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
static int dpu_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor) static int dpu_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor)
{ {
return _dpu_debugfs_init(to_dpu_kms(kms)); return _dpu_debugfs_init(to_dpu_kms(kms), minor);
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment