Commit 1b0c7b48 authored by Thierry Reding's avatar Thierry Reding

drm/tegra: sor - Make debugfs setup consistent

Other output drivers set up debugfs slightly differently. Bring the SOR
driver in line with those for consistency.
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 9578184e
...@@ -1007,12 +1007,13 @@ static const struct file_operations tegra_sor_crc_fops = { ...@@ -1007,12 +1007,13 @@ static const struct file_operations tegra_sor_crc_fops = {
.release = tegra_sor_crc_release, .release = tegra_sor_crc_release,
}; };
static int tegra_sor_debugfs_init(struct tegra_sor *sor, struct dentry *root) static int tegra_sor_debugfs_init(struct tegra_sor *sor,
struct drm_minor *minor)
{ {
struct dentry *entry; struct dentry *entry;
int err = 0; int err = 0;
sor->debugfs = debugfs_create_dir("sor", root); sor->debugfs = debugfs_create_dir("sor", minor->debugfs_root);
if (!sor->debugfs) if (!sor->debugfs)
return -ENOMEM; return -ENOMEM;
...@@ -1021,7 +1022,7 @@ static int tegra_sor_debugfs_init(struct tegra_sor *sor, struct dentry *root) ...@@ -1021,7 +1022,7 @@ static int tegra_sor_debugfs_init(struct tegra_sor *sor, struct dentry *root)
if (!entry) { if (!entry) {
dev_err(sor->dev, dev_err(sor->dev,
"cannot create /sys/kernel/debug/dri/%s/sor/crc\n", "cannot create /sys/kernel/debug/dri/%s/sor/crc\n",
root->d_name.name); minor->debugfs_root->d_name.name);
err = -ENOMEM; err = -ENOMEM;
goto remove; goto remove;
} }
...@@ -1063,9 +1064,7 @@ static int tegra_sor_init(struct host1x_client *client) ...@@ -1063,9 +1064,7 @@ static int tegra_sor_init(struct host1x_client *client)
} }
if (IS_ENABLED(CONFIG_DEBUG_FS)) { if (IS_ENABLED(CONFIG_DEBUG_FS)) {
struct dentry *root = drm->primary->debugfs_root; err = tegra_sor_debugfs_init(sor, drm->primary);
err = tegra_sor_debugfs_init(sor, root);
if (err < 0) if (err < 0)
dev_err(sor->dev, "debugfs setup failed: %d\n", err); dev_err(sor->dev, "debugfs setup failed: %d\n", err);
} }
......
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