Skip to contentSkip to conversation

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

PATCH Superseded Sean Paul 6 participants 11 messages May 24, 2019 – May 28, 2019 5 messages not in the archive

Subsystems (3)
lore
Share & tools
lore

Sean Paul

author
#0 lore raw

PATCH 1/2 drm/msm/dpu: Use provided drm_minor to initialize debugfs

From: Sean Paul <[email protected]>

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>/

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +3 -3
index 885bf88afa3e..d77071965431 100644
@@ -231,7 +231,7 @@ void *dpu_debugfs_create_regset32(const char *name, umode_t mode,
 			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();
 	struct dentry *entry;
@@ -239,7 +239,7 @@ static int _dpu_debugfs_init(struct dpu_kms *dpu_kms)
 	if (!p)
 		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))
 		return -ENODEV;
 
@@ -581,7 +581,7 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)
 #ifdef CONFIG_DEBUG_FS
 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
 
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno

A message that is not in the archive (sent off-list or not yet received): 20190524173231.5040-1-sean-p7yTbzM4H96eqtR555YLDQ@public.gmane.org

author
#2 lore raw

PATCH 2/2 drm/msm/dpu: Remove _dpu_debugfs_init

From: Sean Paul <[email protected]>

Fold it into dpu_debugfs_init.

Cc Stephen Boyd <[email protected]>
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +2 -8
index d77071965431..0a8c334c3a9f 100644
@@ -231,8 +231,9 @@ void *dpu_debugfs_create_regset32(const char *name, umode_t mode,
 			regset, &dpu_fops_regset32);
 }
 
-static int _dpu_debugfs_init(struct dpu_kms *dpu_kms, struct drm_minor *minor)
+static int dpu_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor)
 {
+	struct dpu_kms *dpu_kms = to_dpu_kms(kms);
 	void *p = dpu_hw_util_get_log_mask_ptr();
 	struct dentry *entry;
 
@@ -578,13 +579,6 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)
 	return ret;
 }
 
-#ifdef CONFIG_DEBUG_FS
-static int dpu_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor)
-{
-	return _dpu_debugfs_init(to_dpu_kms(kms), minor);
-}
-#endif
-
 static long dpu_kms_round_pixclk(struct msm_kms *kms, unsigned long rate,
 		struct drm_encoder *encoder)
 {
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
Reviewed-by on v1 2/2
#3 lore raw

Re: [PATCH 2/2] drm/msm/dpu: Remove _dpu_debugfs_init

Quoted 6 lines · Sean Paul

From: Sean Paul <[email protected]>

Fold it into dpu_debugfs_init.

Cc Stephen Boyd <[email protected]>
Quoted 37 lines
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +2 -1
index d77071965431..0a8c334c3a9f 100644
@@ -231,8 +231,9 @@ void *dpu_debugfs_create_regset32(const char
 *name, umode_t mode,
 			regset, &dpu_fops_regset32);
 }
 
-static int _dpu_debugfs_init(struct dpu_kms *dpu_kms, struct drm_minor 
 *minor)
+static int dpu_kms_debugfs_init(struct msm_kms *kms, struct drm_minor 
 *minor)
 {
+	struct dpu_kms *dpu_kms = to_dpu_kms(kms);
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -7
 	void *p = dpu_hw_util_get_log_mask_ptr();
 	struct dentry *entry;
@@ -578,13 +579,6 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms 
 *dpu_kms)
 	return ret;
 }
 
-#ifdef CONFIG_DEBUG_FS
-static int dpu_kms_debugfs_init(struct msm_kms *kms, struct drm_minor 
 *minor)
-{
-	return _dpu_debugfs_init(to_dpu_kms(kms), minor);
-}
-#endif
-
 static long dpu_kms_round_pixclk(struct msm_kms *kms, unsigned long 
Quoted 3 lines

rate,
struct drm_encoder *encoder)
{

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reviewed-by
#4 lore raw
In reply to a message not in the archive
Quoted 11 lines · Sean Paul

From: Sean Paul <[email protected]>

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>/

Quoted 40 lines
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1 -1
index 885bf88afa3e..d77071965431 100644
@@ -231,7 +231,7 @@ void *dpu_debugfs_create_regset32(const char
 *name, umode_t mode,
 			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)
 {
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1 -1
 	void *p = dpu_hw_util_get_log_mask_ptr();
 	struct dentry *entry;
@@ -239,7 +239,7 @@ static int _dpu_debugfs_init(struct dpu_kms 
 *dpu_kms)
 	if (!p)
 		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))
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1 -1
 		return -ENODEV;
@@ -581,7 +581,7 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms 
 *dpu_kms)
 #ifdef CONFIG_DEBUG_FS
 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);
 }
Quoted 1 line

#endif

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno

#5 lore raw
In reply to a message not in the archive

Quoting Sean Paul (2019-05-24 10:32:18)

Quoted 8 lines

From: Sean Paul <[email protected]>

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>/

So does this make it become /sys/kernel/debug/dri/<node>/debug?

I wonder why it can't all be created under /sys/kernel/debug/dri/<node> and then avoid the extra "debug" directory that isn't adding any value?

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno

A message that is not in the archive (sent off-list or not yet received): 5ce85778.1c69fb81.ccfd3.bac8-ATjtLOhZ0NVl57MIdRCFDg@public.gmane.org

#7 lore raw
Quoted 7 lines · Stephen Boyd

Quoting Sean Paul (2019-05-24 10:32:18)

Quoted 5 lines

From: Sean Paul <[email protected]>

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

Quoted 9 lines
Quoted 3 lines

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>/

So does this make it become /sys/kernel/debug/dri/<node>/debug?

I wonder why it can't all be created under /sys/kernel/debug/dri/<node> and then avoid the extra "debug" directory that isn't adding any value?

From the looks of it, it will still create the 'debug' dir, but at least under the correct <node>..

for the record, I'm all for getting rid of the extra 'debug' directory, it saves me some extra typing ;-)

BR,
-R
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno

author
#8 lore raw

PATCH v2 1/1 drm/msm/dpu: Use provided drm_minor to initialize debugfs

In reply to a message not in the archive

From: Sean Paul <[email protected]>

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

This avoids creating a debug directory under /sys/kernel/debug/debug and instead uses /sys/kernel/debug/dri/<node>/

Since we're now putting everything under */dri/<node>, there's no need to create a duplicate "debug" directory. Just put everything in the root.

Changes in v2:
- Remove the unnecessary "debug" directory (Stephen)

Link to v1: https://patchwork.freedesktop.org/patch/msgid/[email protected]

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +3 -7
index 885bf88afa3ec..ad094704610f9 100644
@@ -231,18 +231,14 @@ void *dpu_debugfs_create_regset32(const char *name, umode_t mode,
 			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();
-	struct dentry *entry;
+	struct dentry *entry = minor->debugfs_root;
 
 	if (!p)
 		return -EINVAL;
 
-	entry = debugfs_create_dir("debug", dpu_kms->dev->primary->debugfs_root);
-	if (IS_ERR_OR_NULL(entry))
-		return -ENODEV;
-
 	/* allow root to be NULL */
 	debugfs_create_x32(DPU_DEBUGFS_HWMASKNAME, 0600, entry, p);
 
@@ -581,7 +577,7 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)
 #ifdef CONFIG_DEBUG_FS
 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
 
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno

A message that is not in the archive (sent off-list or not yet received): 20190528151339.207978-1-sean-p7yTbzM4H96eqtR555YLDQ@public.gmane.org

Reviewed-by
#10 lore raw
Quoted 16 lines · Sean Paul

From: Sean Paul <[email protected]>

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

This avoids creating a debug directory under /sys/kernel/debug/debug and instead uses /sys/kernel/debug/dri/<node>/

Since we're now putting everything under */dri/<node>, there's no need to create a duplicate "debug" directory. Just put everything in the root.

Changes in v2:
- Remove the unnecessary "debug" directory (Stephen)

Quoted 6 lines

Link to v1: https://patchwork.freedesktop.org/patch/msgid/[email protected]

nice!

Quoted 41 lines
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +3 -8
index 885bf88afa3ec..ad094704610f9 100644
@@ -231,18 +231,14 @@ void *dpu_debugfs_create_regset32(const char *name, umode_t mode,
                        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();
-       struct dentry *entry;
+       struct dentry *entry = minor->debugfs_root;
 
        if (!p)
                return -EINVAL;
 
-       entry = debugfs_create_dir("debug", dpu_kms->dev->primary->debugfs_root);
-       if (IS_ERR_OR_NULL(entry))
-               return -ENODEV;
-
        /* allow root to be NULL */
        debugfs_create_x32(DPU_DEBUGFS_HWMASKNAME, 0600, entry, p);
 
@@ -581,7 +577,7 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)
 #ifdef CONFIG_DEBUG_FS
 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
 
--

Sean Paul, Software Engineer, Google / Chromium OS

Quoted 4 lines

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno

#11 lore raw
In reply to a message not in the archive
Quoted 38 lines · Sean Paul

From: Sean Paul <[email protected]>

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

This avoids creating a debug directory under /sys/kernel/debug/debug and instead uses /sys/kernel/debug/dri/<node>/

Since we're now putting everything under */dri/<node>, there's no need to create a duplicate "debug" directory. Just put everything in the root.

Changes in v2:
- Remove the unnecessary "debug" directory (Stephen)

Link to v1: https://patchwork.freedesktop.org/patch/msgid/[email protected]

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1 -2
index 885bf88afa3ec..ad094704610f9 100644
@@ -231,18 +231,14 @@ void *dpu_debugfs_create_regset32(const char *name, umode_t mode,
 			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();
-	struct dentry *entry;

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c void *dpu_debugfs_create_regset32(const char *name, umode_t mode, · line 242

Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1 -4
+	struct dentry *entry = minor->debugfs_root;
 
 	if (!p)
 		return -EINVAL;
 
-	entry = debugfs_create_dir("debug", dpu_kms->dev->primary->debugfs_root);
-	if (IS_ERR_OR_NULL(entry))
-		return -ENODEV;
-
 	/* allow root to be NULL */

Minor nit, this comment seems to be misplaced even more now than it was before.

Quoted 13 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1 -1
 	debugfs_create_x32(DPU_DEBUGFS_HWMASKNAME, 0600, entry, p);
 
@@ -581,7 +577,7 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)
 #ifdef CONFIG_DEBUG_FS
 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
 
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno

A message that is not in the archive (sent off-list or not yet received): 20190528154125.GA23227-p/[email protected]

author
#13 lore raw

PATCH 1/1 drm/msm/dpu: Remove bogus comment

From: Sean Paul <[email protected]>

This comment doesn't make any sense, remove it.

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -1
index 885bf88afa3e..50d0e9ba5d2f 100644
@@ -243,7 +243,6 @@ static int _dpu_debugfs_init(struct dpu_kms *dpu_kms)
 	if (IS_ERR_OR_NULL(entry))
 		return -ENODEV;
 
-	/* allow root to be NULL */
 	debugfs_create_x32(DPU_DEBUGFS_HWMASKNAME, 0600, entry, p);
 
 	dpu_debugfs_danger_init(dpu_kms, entry);
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno

A message that is not in the archive (sent off-list or not yet received): 20190528182657.246714-1-sean-p7yTbzM4H96eqtR555YLDQ@public.gmane.org

Reviewed-by
#15 lore raw

Re: [PATCH] drm/msm/dpu: Remove bogus comment

Quoted 9 lines · Sean Paul

From: Sean Paul <[email protected]>

This comment doesn't make any sense, remove it.

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 1 -
 1 file changed, 1 deletion(-)
Quoted 15 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -1
index 885bf88afa3e..50d0e9ba5d2f 100644
@@ -243,7 +243,6 @@ static int _dpu_debugfs_init(struct dpu_kms *dpu_kms)
 	if (IS_ERR_OR_NULL(entry))
 		return -ENODEV;
 
-	/* allow root to be NULL */
 	debugfs_create_x32(DPU_DEBUGFS_HWMASKNAME, 0600, entry, p);
 
 	dpu_debugfs_danger_init(dpu_kms, entry);
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno