From: Sean Paul <sean@poorly.run>
To: Jordan Crouse <jcrouse@codeaurora.org>
Cc: sam@ravnborg.org, linux-arm-msm@vger.kernel.org,
dri-devel@lists.freedesktop.org, bzwang@chromium.org,
seanpaul@chromium.org, abhinavk@codeaurora.org,
freedreno@lists.freedesktop.org
Subject: Re: [PATCH 02/11] drm/msm/dpu: Use DEFINE_SHOW_ATTRIBUTE
Date: Tue, 6 Nov 2018 09:28:38 -0500 [thread overview]
Message-ID: <20181106142838.GM154160@art_vandelay> (raw)
In-Reply-To: <20181105233103.7657-3-jcrouse@codeaurora.org>
On Mon, Nov 05, 2018 at 04:30:54PM -0700, Jordan Crouse wrote:
> Use the standard DEFINE_SHOW_ATTRIBUTE macro for seq_file based
> debugfs files instead of custom macros and hand-coded functions.
>
> v2: Added a cleanup for dpu_encoder.c too
>
> Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Reviewed-by: Sean Paul <sean@poorly.run>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c | 14 +-------
> drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 31 +++---------------
> drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 20 +++---------
> drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 34 +++-----------------
> 4 files changed, 14 insertions(+), 85 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c
> index 879c13fe74e0..7607aac9449c 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c
> @@ -299,18 +299,6 @@ static void dpu_disable_all_irqs(struct dpu_kms *dpu_kms)
> }
>
> #ifdef CONFIG_DEBUG_FS
> -#define DEFINE_DPU_DEBUGFS_SEQ_FOPS(__prefix) \
> -static int __prefix ## _open(struct inode *inode, struct file *file) \
> -{ \
> - return single_open(file, __prefix ## _show, inode->i_private); \
> -} \
> -static const struct file_operations __prefix ## _fops = { \
> - .owner = THIS_MODULE, \
> - .open = __prefix ## _open, \
> - .release = single_release, \
> - .read = seq_read, \
> - .llseek = seq_lseek, \
> -}
>
> static int dpu_debugfs_core_irq_show(struct seq_file *s, void *v)
> {
> @@ -341,7 +329,7 @@ static int dpu_debugfs_core_irq_show(struct seq_file *s, void *v)
> return 0;
> }
>
> -DEFINE_DPU_DEBUGFS_SEQ_FOPS(dpu_debugfs_core_irq);
> +DEFINE_SHOW_ATTRIBUTE(dpu_debugfs_core_irq);
>
> int dpu_debugfs_core_irq_init(struct dpu_kms *dpu_kms,
> struct dentry *parent)
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> index ed84cf44a222..11052bee03cf 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> @@ -1232,7 +1232,7 @@ int dpu_crtc_vblank(struct drm_crtc *crtc, bool en)
> }
>
> #ifdef CONFIG_DEBUG_FS
> -static int _dpu_debugfs_status_show(struct seq_file *s, void *data)
> +static int dpu_crtc_debugfs_status_show(struct seq_file *s, void *data)
> {
> struct dpu_crtc *dpu_crtc;
> struct dpu_plane_state *pstate = NULL;
> @@ -1351,23 +1351,7 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data)
> return 0;
> }
>
> -static int _dpu_debugfs_status_open(struct inode *inode, struct file *file)
> -{
> - return single_open(file, _dpu_debugfs_status_show, inode->i_private);
> -}
> -
> -#define DEFINE_DPU_DEBUGFS_SEQ_FOPS(__prefix) \
> -static int __prefix ## _open(struct inode *inode, struct file *file) \
> -{ \
> - return single_open(file, __prefix ## _show, inode->i_private); \
> -} \
> -static const struct file_operations __prefix ## _fops = { \
> - .owner = THIS_MODULE, \
> - .open = __prefix ## _open, \
> - .release = single_release, \
> - .read = seq_read, \
> - .llseek = seq_lseek, \
> -}
> +DEFINE_SHOW_ATTRIBUTE(dpu_crtc_debugfs_status);
>
> static int dpu_crtc_debugfs_state_show(struct seq_file *s, void *v)
> {
> @@ -1391,20 +1375,13 @@ static int dpu_crtc_debugfs_state_show(struct seq_file *s, void *v)
>
> return 0;
> }
> -DEFINE_DPU_DEBUGFS_SEQ_FOPS(dpu_crtc_debugfs_state);
> +DEFINE_SHOW_ATTRIBUTE(dpu_crtc_debugfs_state);
>
> static int _dpu_crtc_init_debugfs(struct drm_crtc *crtc)
> {
> struct dpu_crtc *dpu_crtc;
> struct dpu_kms *dpu_kms;
>
> - static const struct file_operations debugfs_status_fops = {
> - .open = _dpu_debugfs_status_open,
> - .read = seq_read,
> - .llseek = seq_lseek,
> - .release = single_release,
> - };
> -
> if (!crtc)
> return -EINVAL;
> dpu_crtc = to_dpu_crtc(crtc);
> @@ -1419,7 +1396,7 @@ static int _dpu_crtc_init_debugfs(struct drm_crtc *crtc)
> /* don't error check these */
> debugfs_create_file("status", 0400,
> dpu_crtc->debugfs_root,
> - dpu_crtc, &debugfs_status_fops);
> + dpu_crtc, &dpu_crtc_debugfs_status_fops);
> debugfs_create_file("state", 0600,
> dpu_crtc->debugfs_root,
> &dpu_crtc->base,
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> index d5e252941ba8..5559e5d40142 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> @@ -1836,7 +1836,7 @@ void dpu_encoder_prepare_commit(struct drm_encoder *drm_enc)
> }
>
> #ifdef CONFIG_DEBUG_FS
> -static int _dpu_encoder_status_show(struct seq_file *s, void *data)
> +static int dpu_encoder_status_show(struct seq_file *s, void *data)
> {
> struct dpu_encoder_virt *dpu_enc;
> int i;
> @@ -1875,11 +1875,7 @@ static int _dpu_encoder_status_show(struct seq_file *s, void *data)
> return 0;
> }
>
> -static int _dpu_encoder_debugfs_status_open(struct inode *inode,
> - struct file *file)
> -{
> - return single_open(file, _dpu_encoder_status_show, inode->i_private);
> -}
> +DEFINE_SHOW_ATTRIBUTE(dpu_encoder_status);
>
> static int _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc)
> {
> @@ -1887,14 +1883,6 @@ static int _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc)
> struct msm_drm_private *priv;
> struct dpu_kms *dpu_kms;
> int i;
> -
> - static const struct file_operations debugfs_status_fops = {
> - .open = _dpu_encoder_debugfs_status_open,
> - .read = seq_read,
> - .llseek = seq_lseek,
> - .release = single_release,
> - };
> -
> char name[DPU_NAME_SIZE];
>
> if (!drm_enc || !drm_enc->dev || !drm_enc->dev->dev_private) {
> @@ -1915,8 +1903,8 @@ static int _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc)
> return -ENOMEM;
>
> /* don't error check these */
> - debugfs_create_file("status", 0600,
> - dpu_enc->debugfs_root, dpu_enc, &debugfs_status_fops);
> + debugfs_create_file("status", 0600, dpu_enc->debugfs_root, dpu_enc,
> + &dpu_encoder_status_fops);
>
> for (i = 0; i < dpu_enc->num_phys_encs; i++)
> if (dpu_enc->phys_encs[i] &&
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> index fd5bad16338d..7e3ba128cbaf 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> @@ -113,30 +113,17 @@ static int _dpu_danger_signal_status(struct seq_file *s,
> return 0;
> }
>
> -#define DEFINE_DPU_DEBUGFS_SEQ_FOPS(__prefix) \
> -static int __prefix ## _open(struct inode *inode, struct file *file) \
> -{ \
> - return single_open(file, __prefix ## _show, inode->i_private); \
> -} \
> -static const struct file_operations __prefix ## _fops = { \
> - .owner = THIS_MODULE, \
> - .open = __prefix ## _open, \
> - .release = single_release, \
> - .read = seq_read, \
> - .llseek = seq_lseek, \
> -}
> -
> static int dpu_debugfs_danger_stats_show(struct seq_file *s, void *v)
> {
> return _dpu_danger_signal_status(s, true);
> }
> -DEFINE_DPU_DEBUGFS_SEQ_FOPS(dpu_debugfs_danger_stats);
> +DEFINE_SHOW_ATTRIBUTE(dpu_debugfs_danger_stats);
>
> static int dpu_debugfs_safe_stats_show(struct seq_file *s, void *v)
> {
> return _dpu_danger_signal_status(s, false);
> }
> -DEFINE_DPU_DEBUGFS_SEQ_FOPS(dpu_debugfs_safe_stats);
> +DEFINE_SHOW_ATTRIBUTE(dpu_debugfs_safe_stats);
>
> static void dpu_debugfs_danger_destroy(struct dpu_kms *dpu_kms)
> {
> @@ -162,7 +149,7 @@ static int dpu_debugfs_danger_init(struct dpu_kms *dpu_kms,
> return 0;
> }
>
> -static int _dpu_debugfs_show_regset32(struct seq_file *s, void *data)
> +static int dpu_debugfs_regset32_show(struct seq_file *s, void *data)
> {
> struct dpu_debugfs_regset32 *regset;
> struct dpu_kms *dpu_kms;
> @@ -212,18 +199,7 @@ static int _dpu_debugfs_show_regset32(struct seq_file *s, void *data)
> return 0;
> }
>
> -static int dpu_debugfs_open_regset32(struct inode *inode,
> - struct file *file)
> -{
> - return single_open(file, _dpu_debugfs_show_regset32, inode->i_private);
> -}
> -
> -static const struct file_operations dpu_fops_regset32 = {
> - .open = dpu_debugfs_open_regset32,
> - .read = seq_read,
> - .llseek = seq_lseek,
> - .release = single_release,
> -};
> +DEFINE_SHOW_ATTRIBUTE(dpu_debugfs_regset32);
>
> void dpu_debugfs_setup_regset32(struct dpu_debugfs_regset32 *regset,
> uint32_t offset, uint32_t length, struct dpu_kms *dpu_kms)
> @@ -245,7 +221,7 @@ void *dpu_debugfs_create_regset32(const char *name, umode_t mode,
> regset->offset = round_down(regset->offset, 4);
>
> return debugfs_create_file(name, mode, parent,
> - regset, &dpu_fops_regset32);
> + regset, &dpu_debugfs_regset32_fops);
> }
>
> static int _dpu_debugfs_init(struct dpu_kms *dpu_kms)
> --
> 2.18.0
>
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2018-11-06 14:28 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-05 23:30 [PATCH v2 00/11] DPU cleanups Jordan Crouse
2018-11-05 23:30 ` [PATCH 01/11] drm/msm/dpu: Remove dpu_dbg Jordan Crouse
[not found] ` <20181105233103.7657-2-jcrouse-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-11-06 14:22 ` Sean Paul
[not found] ` <20181105233103.7657-1-jcrouse-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-11-05 23:30 ` [PATCH 02/11] drm/msm/dpu: Use DEFINE_SHOW_ATTRIBUTE Jordan Crouse
2018-11-06 14:28 ` Sean Paul [this message]
2018-11-05 23:30 ` [PATCH 03/11] drm/msm/dpu: Remove dpu_crtc_get_mixer_height Jordan Crouse
[not found] ` <20181105233103.7657-4-jcrouse-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-11-06 14:30 ` Sean Paul
2018-11-05 23:30 ` [PATCH 04/11] drm/msm/dpu: Remove dpu_crtc_is_enabled() Jordan Crouse
2018-11-06 14:31 ` Sean Paul
2018-11-05 23:30 ` [PATCH 05/11] drm/msm/dpu: Remove unused functions Jordan Crouse
2018-11-06 14:31 ` Sean Paul
2018-11-05 23:30 ` [PATCH 06/11] drm/msm/dpu: Cleanup callers of dpu_hw_blk_init Jordan Crouse
[not found] ` <20181105233103.7657-7-jcrouse-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-11-06 14:45 ` Sean Paul
2018-11-05 23:30 ` [PATCH 07/11] drm/msm: Make irq_postinstall optional Jordan Crouse
[not found] ` <20181105233103.7657-8-jcrouse-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-11-06 14:46 ` Sean Paul
2018-11-05 23:31 ` [PATCH 08/11] drm/msm/dpu: Remove dpu_irq and unused functions Jordan Crouse
[not found] ` <20181105233103.7657-9-jcrouse-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-11-06 14:46 ` Sean Paul
2018-11-05 23:31 ` [PATCH 09/11] drm/msm/dpu: Cleanup the debugfs functions Jordan Crouse
[not found] ` <20181105233103.7657-10-jcrouse-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-11-06 15:05 ` Sean Paul
2018-11-05 23:31 ` [PATCH 11/11] drm/msm/dpu: Clean up dpu_media_info.h static inline functions Jordan Crouse
[not found] ` <20181105233103.7657-12-jcrouse-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-11-06 15:13 ` Sean Paul
2018-11-06 16:16 ` Sam Ravnborg
2018-11-07 19:55 ` [PATCH v3 1/2] drm/msm/dpu: Further cleanups for " Jordan Crouse
[not found] ` <20181107195503.12204-1-jcrouse-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-11-07 19:55 ` [PATCH v3 2/2] drm/msm/dpu: Clean up dpu_media_info.h " Jordan Crouse
2018-11-05 23:31 ` [PATCH 10/11] drm/msm/dpu: Further cleanups for " Jordan Crouse
2018-11-06 15:12 ` Sean Paul
-- strict thread matches above, loose matches on Subject: below --
2018-10-18 19:58 [PATCH 00/11] DPU cleanups Jordan Crouse
[not found] ` <20181018195836.15885-1-jcrouse-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-10-18 19:58 ` [PATCH 02/11] drm/msm/dpu: Use DEFINE_SHOW_ATTRIBUTE Jordan Crouse
[not found] ` <20181018195836.15885-3-jcrouse-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-10-18 21:43 ` Bruce Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181106142838.GM154160@art_vandelay \
--to=sean@poorly.run \
--cc=abhinavk@codeaurora.org \
--cc=bzwang@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=jcrouse@codeaurora.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=sam@ravnborg.org \
--cc=seanpaul@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox