* [PATCH 0/2] drm/msm/dpu: yet another attempt at cleaning up encoder's debugfs @ 2023-05-21 19:04 Dmitry Baryshkov 2023-05-21 19:04 ` [PATCH 1/2] drm/msm/dpu: drop (mostly) unused DPU_NAME_SIZE define Dmitry Baryshkov 2023-05-21 19:04 ` [PATCH 2/2] drm/msm/dpu: switch dpu_encoder to use drm_debugfs_add_file() Dmitry Baryshkov 0 siblings, 2 replies; 5+ messages in thread From: Dmitry Baryshkov @ 2023-05-21 19:04 UTC (permalink / raw) To: Rob Clark, Sean Paul, Abhinav Kumar Cc: Marijn Suijten, Stephen Boyd, David Airlie, Daniel Vetter, Bjorn Andersson, linux-arm-msm, dri-devel, freedreno Simplify dpu_encoder slightly by using drm_debugfs_add_file(). Dmitry Baryshkov (2): drm/msm/dpu: drop (mostly) unused DPU_NAME_SIZE define drm/msm/dpu: switch dpu_encoder to use drm_debugfs_add_file() drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 40 ++++++--------------- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 2 -- 3 files changed, 11 insertions(+), 33 deletions(-) -- 2.39.2 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] drm/msm/dpu: drop (mostly) unused DPU_NAME_SIZE define 2023-05-21 19:04 [PATCH 0/2] drm/msm/dpu: yet another attempt at cleaning up encoder's debugfs Dmitry Baryshkov @ 2023-05-21 19:04 ` Dmitry Baryshkov 2023-05-21 19:04 ` [PATCH 2/2] drm/msm/dpu: switch dpu_encoder to use drm_debugfs_add_file() Dmitry Baryshkov 1 sibling, 0 replies; 5+ messages in thread From: Dmitry Baryshkov @ 2023-05-21 19:04 UTC (permalink / raw) To: Rob Clark, Sean Paul, Abhinav Kumar Cc: Marijn Suijten, Stephen Boyd, David Airlie, Daniel Vetter, Bjorn Andersson, linux-arm-msm, dri-devel, freedreno This define is used only in one place, in dpu_encoder debugfs code. Inline the value and drop the define completely. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index c771383446f2..af34932729db 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -2116,14 +2116,14 @@ static int _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc) { struct dpu_encoder_virt *dpu_enc = to_dpu_encoder_virt(drm_enc); - char name[DPU_NAME_SIZE]; + char name[12]; if (!drm_enc->dev) { DPU_ERROR("invalid encoder or kms\n"); return -EINVAL; } - snprintf(name, DPU_NAME_SIZE, "encoder%u", drm_enc->base.id); + snprintf(name, sizeof(name), "encoder%u", drm_enc->base.id); /* create overall sub-directory for the encoder */ dpu_enc->debugfs_root = debugfs_create_dir(name, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h index 66209e2448d2..c4f82180ad10 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h @@ -63,8 +63,6 @@ #define ktime_compare_safe(A, B) \ ktime_compare(ktime_sub((A), (B)), ktime_set(0, 0)) -#define DPU_NAME_SIZE 12 - struct dpu_kms { struct msm_kms base; struct drm_device *dev; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c index 14b5cfe30611..ac75ba13aa01 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -42,8 +42,6 @@ #define SHARP_SMOOTH_THR_DEFAULT 8 #define SHARP_NOISE_THR_DEFAULT 2 -#define DPU_NAME_SIZE 12 - #define DPU_PLANE_COLOR_FILL_FLAG BIT(31) #define DPU_ZPOS_MAX 255 -- 2.39.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] drm/msm/dpu: switch dpu_encoder to use drm_debugfs_add_file() 2023-05-21 19:04 [PATCH 0/2] drm/msm/dpu: yet another attempt at cleaning up encoder's debugfs Dmitry Baryshkov 2023-05-21 19:04 ` [PATCH 1/2] drm/msm/dpu: drop (mostly) unused DPU_NAME_SIZE define Dmitry Baryshkov @ 2023-05-21 19:04 ` Dmitry Baryshkov 2023-05-21 19:21 ` Marijn Suijten 1 sibling, 1 reply; 5+ messages in thread From: Dmitry Baryshkov @ 2023-05-21 19:04 UTC (permalink / raw) To: Rob Clark, Sean Paul, Abhinav Kumar Cc: Marijn Suijten, Stephen Boyd, David Airlie, Daniel Vetter, Bjorn Andersson, linux-arm-msm, dri-devel, freedreno Use drm_debugfs_add_file() for encoder's status file. This changes the name of the status file from encoder%d/status to just encoder%d. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 40 ++++++--------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index af34932729db..0ac68f44ec74 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -14,6 +14,7 @@ #include <drm/drm_atomic.h> #include <drm/drm_crtc.h> +#include <drm/drm_debugfs.h> #include <drm/drm_file.h> #include <drm/drm_probe_helper.h> @@ -142,7 +143,6 @@ enum dpu_enc_rc_states { * @crtc_kickoff_cb: Callback into CRTC that will flush & start * all CTL paths * @crtc_kickoff_cb_data: Opaque user data given to crtc_kickoff_cb - * @debugfs_root: Debug file system root file node * @enc_lock: Lock around physical encoder * create/destroy/enable/disable * @frame_busy_mask: Bitmask tracking which phys_enc we are still @@ -186,7 +186,6 @@ struct dpu_encoder_virt { struct drm_crtc *crtc; struct drm_connector *connector; - struct dentry *debugfs_root; struct mutex enc_lock; DECLARE_BITMAP(frame_busy_mask, MAX_PHYS_ENCODERS_PER_VIRTUAL); void (*crtc_frame_event_cb)(void *, u32 event); @@ -2091,7 +2090,8 @@ void dpu_encoder_helper_phys_cleanup(struct dpu_encoder_phys *phys_enc) #ifdef CONFIG_DEBUG_FS static int _dpu_encoder_status_show(struct seq_file *s, void *data) { - struct dpu_encoder_virt *dpu_enc = s->private; + struct drm_debugfs_entry *entry = s->private; + struct dpu_encoder_virt *dpu_enc = entry->file.data; int i; mutex_lock(&dpu_enc->enc_lock); @@ -2110,48 +2110,31 @@ static int _dpu_encoder_status_show(struct seq_file *s, void *data) return 0; } -DEFINE_SHOW_ATTRIBUTE(_dpu_encoder_status); - -static int _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc) +static void _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc) { struct dpu_encoder_virt *dpu_enc = to_dpu_encoder_virt(drm_enc); - - char name[12]; + char *name; if (!drm_enc->dev) { DPU_ERROR("invalid encoder or kms\n"); - return -EINVAL; + return; } - snprintf(name, sizeof(name), "encoder%u", drm_enc->base.id); + name = devm_kasprintf(drm_enc->dev->dev, GFP_KERNEL, "encoder%u", drm_enc->base.id); - /* create overall sub-directory for the encoder */ - dpu_enc->debugfs_root = debugfs_create_dir(name, - drm_enc->dev->primary->debugfs_root); - - /* don't error check these */ - debugfs_create_file("status", 0600, - dpu_enc->debugfs_root, dpu_enc, &_dpu_encoder_status_fops); - - return 0; + drm_debugfs_add_file(drm_enc->dev, name, _dpu_encoder_status_show, dpu_enc); } #else -static int _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc) +static void _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc) { - return 0; } #endif static int dpu_encoder_late_register(struct drm_encoder *encoder) { - return _dpu_encoder_init_debugfs(encoder); -} - -static void dpu_encoder_early_unregister(struct drm_encoder *encoder) -{ - struct dpu_encoder_virt *dpu_enc = to_dpu_encoder_virt(encoder); + _dpu_encoder_init_debugfs(encoder); - debugfs_remove_recursive(dpu_enc->debugfs_root); + return 0; } static int dpu_encoder_virt_add_phys_encs( @@ -2380,7 +2363,6 @@ static const struct drm_encoder_helper_funcs dpu_encoder_helper_funcs = { static const struct drm_encoder_funcs dpu_encoder_funcs = { .destroy = dpu_encoder_destroy, .late_register = dpu_encoder_late_register, - .early_unregister = dpu_encoder_early_unregister, }; int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc, -- 2.39.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drm/msm/dpu: switch dpu_encoder to use drm_debugfs_add_file() 2023-05-21 19:04 ` [PATCH 2/2] drm/msm/dpu: switch dpu_encoder to use drm_debugfs_add_file() Dmitry Baryshkov @ 2023-05-21 19:21 ` Marijn Suijten 2023-05-21 19:22 ` Dmitry Baryshkov 0 siblings, 1 reply; 5+ messages in thread From: Marijn Suijten @ 2023-05-21 19:21 UTC (permalink / raw) To: Dmitry Baryshkov Cc: Rob Clark, Sean Paul, Abhinav Kumar, Stephen Boyd, David Airlie, Daniel Vetter, Bjorn Andersson, linux-arm-msm, dri-devel, freedreno On 2023-05-21 22:04:42, Dmitry Baryshkov wrote: > Use drm_debugfs_add_file() for encoder's status file. This changes the > name of the status file from encoder%d/status to just encoder%d. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 40 ++++++--------------- > 1 file changed, 11 insertions(+), 29 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > index af34932729db..0ac68f44ec74 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > @@ -14,6 +14,7 @@ > > #include <drm/drm_atomic.h> > #include <drm/drm_crtc.h> > +#include <drm/drm_debugfs.h> > #include <drm/drm_file.h> > #include <drm/drm_probe_helper.h> > > @@ -142,7 +143,6 @@ enum dpu_enc_rc_states { > * @crtc_kickoff_cb: Callback into CRTC that will flush & start > * all CTL paths > * @crtc_kickoff_cb_data: Opaque user data given to crtc_kickoff_cb > - * @debugfs_root: Debug file system root file node > * @enc_lock: Lock around physical encoder > * create/destroy/enable/disable > * @frame_busy_mask: Bitmask tracking which phys_enc we are still > @@ -186,7 +186,6 @@ struct dpu_encoder_virt { > struct drm_crtc *crtc; > struct drm_connector *connector; > > - struct dentry *debugfs_root; > struct mutex enc_lock; > DECLARE_BITMAP(frame_busy_mask, MAX_PHYS_ENCODERS_PER_VIRTUAL); > void (*crtc_frame_event_cb)(void *, u32 event); > @@ -2091,7 +2090,8 @@ void dpu_encoder_helper_phys_cleanup(struct dpu_encoder_phys *phys_enc) > #ifdef CONFIG_DEBUG_FS > static int _dpu_encoder_status_show(struct seq_file *s, void *data) > { > - struct dpu_encoder_virt *dpu_enc = s->private; > + struct drm_debugfs_entry *entry = s->private; > + struct dpu_encoder_virt *dpu_enc = entry->file.data; > int i; > > mutex_lock(&dpu_enc->enc_lock); > @@ -2110,48 +2110,31 @@ static int _dpu_encoder_status_show(struct seq_file *s, void *data) > return 0; > } > > -DEFINE_SHOW_ATTRIBUTE(_dpu_encoder_status); > - > -static int _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc) > +static void _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc) > { > struct dpu_encoder_virt *dpu_enc = to_dpu_encoder_virt(drm_enc); > - > - char name[12]; > + char *name; > > if (!drm_enc->dev) { > DPU_ERROR("invalid encoder or kms\n"); > - return -EINVAL; > + return; > } > > - snprintf(name, sizeof(name), "encoder%u", drm_enc->base.id); > + name = devm_kasprintf(drm_enc->dev->dev, GFP_KERNEL, "encoder%u", drm_enc->base.id); > > - /* create overall sub-directory for the encoder */ > - dpu_enc->debugfs_root = debugfs_create_dir(name, > - drm_enc->dev->primary->debugfs_root); > - > - /* don't error check these */ > - debugfs_create_file("status", 0600, > - dpu_enc->debugfs_root, dpu_enc, &_dpu_encoder_status_fops); I still have a looping callback to late_register() here, what series does this depend on? - Marijn > - > - return 0; > + drm_debugfs_add_file(drm_enc->dev, name, _dpu_encoder_status_show, dpu_enc); > } > #else > -static int _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc) > +static void _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc) > { > - return 0; > } > #endif > > static int dpu_encoder_late_register(struct drm_encoder *encoder) > { > - return _dpu_encoder_init_debugfs(encoder); > -} > - > -static void dpu_encoder_early_unregister(struct drm_encoder *encoder) > -{ > - struct dpu_encoder_virt *dpu_enc = to_dpu_encoder_virt(encoder); > + _dpu_encoder_init_debugfs(encoder); > > - debugfs_remove_recursive(dpu_enc->debugfs_root); > + return 0; > } > > static int dpu_encoder_virt_add_phys_encs( > @@ -2380,7 +2363,6 @@ static const struct drm_encoder_helper_funcs dpu_encoder_helper_funcs = { > static const struct drm_encoder_funcs dpu_encoder_funcs = { > .destroy = dpu_encoder_destroy, > .late_register = dpu_encoder_late_register, > - .early_unregister = dpu_encoder_early_unregister, > }; > > int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc, > -- > 2.39.2 > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drm/msm/dpu: switch dpu_encoder to use drm_debugfs_add_file() 2023-05-21 19:21 ` Marijn Suijten @ 2023-05-21 19:22 ` Dmitry Baryshkov 0 siblings, 0 replies; 5+ messages in thread From: Dmitry Baryshkov @ 2023-05-21 19:22 UTC (permalink / raw) To: Marijn Suijten Cc: Rob Clark, Sean Paul, Abhinav Kumar, Stephen Boyd, David Airlie, Daniel Vetter, Bjorn Andersson, linux-arm-msm, dri-devel, freedreno On 21/05/2023 22:21, Marijn Suijten wrote: > On 2023-05-21 22:04:42, Dmitry Baryshkov wrote: >> Use drm_debugfs_add_file() for encoder's status file. This changes the >> name of the status file from encoder%d/status to just encoder%d. >> >> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> >> --- >> drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 40 ++++++--------------- >> 1 file changed, 11 insertions(+), 29 deletions(-) >> >> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c >> index af34932729db..0ac68f44ec74 100644 >> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c >> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c >> @@ -14,6 +14,7 @@ >> >> #include <drm/drm_atomic.h> >> #include <drm/drm_crtc.h> >> +#include <drm/drm_debugfs.h> >> #include <drm/drm_file.h> >> #include <drm/drm_probe_helper.h> >> >> @@ -142,7 +143,6 @@ enum dpu_enc_rc_states { >> * @crtc_kickoff_cb: Callback into CRTC that will flush & start >> * all CTL paths >> * @crtc_kickoff_cb_data: Opaque user data given to crtc_kickoff_cb >> - * @debugfs_root: Debug file system root file node >> * @enc_lock: Lock around physical encoder >> * create/destroy/enable/disable >> * @frame_busy_mask: Bitmask tracking which phys_enc we are still >> @@ -186,7 +186,6 @@ struct dpu_encoder_virt { >> struct drm_crtc *crtc; >> struct drm_connector *connector; >> >> - struct dentry *debugfs_root; >> struct mutex enc_lock; >> DECLARE_BITMAP(frame_busy_mask, MAX_PHYS_ENCODERS_PER_VIRTUAL); >> void (*crtc_frame_event_cb)(void *, u32 event); >> @@ -2091,7 +2090,8 @@ void dpu_encoder_helper_phys_cleanup(struct dpu_encoder_phys *phys_enc) >> #ifdef CONFIG_DEBUG_FS >> static int _dpu_encoder_status_show(struct seq_file *s, void *data) >> { >> - struct dpu_encoder_virt *dpu_enc = s->private; >> + struct drm_debugfs_entry *entry = s->private; >> + struct dpu_encoder_virt *dpu_enc = entry->file.data; >> int i; >> >> mutex_lock(&dpu_enc->enc_lock); >> @@ -2110,48 +2110,31 @@ static int _dpu_encoder_status_show(struct seq_file *s, void *data) >> return 0; >> } >> >> -DEFINE_SHOW_ATTRIBUTE(_dpu_encoder_status); >> - >> -static int _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc) >> +static void _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc) >> { >> struct dpu_encoder_virt *dpu_enc = to_dpu_encoder_virt(drm_enc); >> - >> - char name[12]; >> + char *name; >> >> if (!drm_enc->dev) { >> DPU_ERROR("invalid encoder or kms\n"); >> - return -EINVAL; >> + return; >> } >> >> - snprintf(name, sizeof(name), "encoder%u", drm_enc->base.id); >> + name = devm_kasprintf(drm_enc->dev->dev, GFP_KERNEL, "encoder%u", drm_enc->base.id); >> >> - /* create overall sub-directory for the encoder */ >> - dpu_enc->debugfs_root = debugfs_create_dir(name, >> - drm_enc->dev->primary->debugfs_root); >> - >> - /* don't error check these */ >> - debugfs_create_file("status", 0600, >> - dpu_enc->debugfs_root, dpu_enc, &_dpu_encoder_status_fops); > > I still have a looping callback to late_register() here, what series > does this depend on? Argh, I have sent 2 patches instead of sending 3. > > - Marijn > >> - >> - return 0; >> + drm_debugfs_add_file(drm_enc->dev, name, _dpu_encoder_status_show, dpu_enc); >> } >> #else >> -static int _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc) >> +static void _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc) >> { >> - return 0; >> } >> #endif >> >> static int dpu_encoder_late_register(struct drm_encoder *encoder) >> { >> - return _dpu_encoder_init_debugfs(encoder); >> -} >> - >> -static void dpu_encoder_early_unregister(struct drm_encoder *encoder) >> -{ >> - struct dpu_encoder_virt *dpu_enc = to_dpu_encoder_virt(encoder); >> + _dpu_encoder_init_debugfs(encoder); >> >> - debugfs_remove_recursive(dpu_enc->debugfs_root); >> + return 0; >> } >> >> static int dpu_encoder_virt_add_phys_encs( >> @@ -2380,7 +2363,6 @@ static const struct drm_encoder_helper_funcs dpu_encoder_helper_funcs = { >> static const struct drm_encoder_funcs dpu_encoder_funcs = { >> .destroy = dpu_encoder_destroy, >> .late_register = dpu_encoder_late_register, >> - .early_unregister = dpu_encoder_early_unregister, >> }; >> >> int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc, >> -- >> 2.39.2 >> -- With best wishes Dmitry ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-05-21 19:22 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-05-21 19:04 [PATCH 0/2] drm/msm/dpu: yet another attempt at cleaning up encoder's debugfs Dmitry Baryshkov 2023-05-21 19:04 ` [PATCH 1/2] drm/msm/dpu: drop (mostly) unused DPU_NAME_SIZE define Dmitry Baryshkov 2023-05-21 19:04 ` [PATCH 2/2] drm/msm/dpu: switch dpu_encoder to use drm_debugfs_add_file() Dmitry Baryshkov 2023-05-21 19:21 ` Marijn Suijten 2023-05-21 19:22 ` Dmitry Baryshkov
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox