linux-kernel - Re: [PATCH 3/9] drm/arm/hdlcd: use new debugfs device-centered functions

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <24309184-0260-ce92-5a28-4c0d99c611d2@igalia.com>
Date:   Fri, 6 Jan 2023 16:49:15 -0300
From:   Maíra Canal <mcanal@...lia.com>
To:     David Airlie <airlied@...il.com>, Daniel Vetter <daniel@...ll.ch>,
        dri-devel@...ts.freedesktop.org, linux-kernel@...r.kernel.org
Cc:     André Almeida <andrealmeid@...lia.com>,
        Tomi Valkeinen <tomba@...nel.org>,
        Emma Anholt <emma@...olt.net>,
        Alexey Brodkin <abrodkin@...opsys.com>,
        Liviu Dudau <liviu.dudau@....com>,
        etnaviv@...ts.freedesktop.org,
        Gurchetan Singh <gurchetansingh@...omium.org>,
        Melissa Wen <mwen@...lia.com>, noralf@...nnes.org,
        Gerd Hoffmann <kraxel@...hat.com>,
        Russell King <linux+etnaviv@...linux.org.uk>,
        David Airlie <airlied@...hat.com>
Subject: Re: [PATCH 3/9] drm/arm/hdlcd: use new debugfs device-centered
 functions

On 12/26/22 12:50, Maíra Canal wrote:
> Replace the use of drm_debugfs_create_files() with the new
> drm_debugfs_add_files() function, which center the debugfs files
> management on the drm_device instead of drm_minor. Moreover, remove the
> debugfs_init hook and add the debugfs files directly on hdlcd_drm_bind(),
> before drm_dev_register().
> 
> Signed-off-by: Maíra Canal <mcanal@...lia.com>

Applied to drm/drm-misc (drm-misc-next).

Best Regards,
- Maíra Canal

> ---
>   drivers/gpu/drm/arm/hdlcd_drv.c | 24 +++++++++---------------
>   1 file changed, 9 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c
> index 7043d1c9ed8f..e3507dd6f82a 100644
> --- a/drivers/gpu/drm/arm/hdlcd_drv.c
> +++ b/drivers/gpu/drm/arm/hdlcd_drv.c
> @@ -195,8 +195,8 @@ static int hdlcd_setup_mode_config(struct drm_device *drm)
>   #ifdef CONFIG_DEBUG_FS
>   static int hdlcd_show_underrun_count(struct seq_file *m, void *arg)
>   {
> -	struct drm_info_node *node = (struct drm_info_node *)m->private;
> -	struct drm_device *drm = node->minor->dev;
> +	struct drm_debugfs_entry *entry = m->private;
> +	struct drm_device *drm = entry->dev;
>   	struct hdlcd_drm_private *hdlcd = drm_to_hdlcd_priv(drm);
>   
>   	seq_printf(m, "underrun : %d\n", atomic_read(&hdlcd->buffer_underrun_count));
> @@ -208,8 +208,8 @@ static int hdlcd_show_underrun_count(struct seq_file *m, void *arg)
>   
>   static int hdlcd_show_pxlclock(struct seq_file *m, void *arg)
>   {
> -	struct drm_info_node *node = (struct drm_info_node *)m->private;
> -	struct drm_device *drm = node->minor->dev;
> +	struct drm_debugfs_entry *entry = m->private;
> +	struct drm_device *drm = entry->dev;
>   	struct hdlcd_drm_private *hdlcd = drm_to_hdlcd_priv(drm);
>   	unsigned long clkrate = clk_get_rate(hdlcd->clk);
>   	unsigned long mode_clock = hdlcd->crtc.mode.crtc_clock * 1000;
> @@ -219,17 +219,10 @@ static int hdlcd_show_pxlclock(struct seq_file *m, void *arg)
>   	return 0;
>   }
>   
> -static struct drm_info_list hdlcd_debugfs_list[] = {
> +static struct drm_debugfs_info hdlcd_debugfs_list[] = {
>   	{ "interrupt_count", hdlcd_show_underrun_count, 0 },
>   	{ "clocks", hdlcd_show_pxlclock, 0 },
>   };
> -
> -static void hdlcd_debugfs_init(struct drm_minor *minor)
> -{
> -	drm_debugfs_create_files(hdlcd_debugfs_list,
> -				 ARRAY_SIZE(hdlcd_debugfs_list),
> -				 minor->debugfs_root, minor);
> -}
>   #endif
>   
>   DEFINE_DRM_GEM_DMA_FOPS(fops);
> @@ -237,9 +230,6 @@ DEFINE_DRM_GEM_DMA_FOPS(fops);
>   static const struct drm_driver hdlcd_driver = {
>   	.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
>   	DRM_GEM_DMA_DRIVER_OPS,
> -#ifdef CONFIG_DEBUG_FS
> -	.debugfs_init = hdlcd_debugfs_init,
> -#endif
>   	.fops = &fops,
>   	.name = "hdlcd",
>   	.desc = "ARM HDLCD Controller DRM",
> @@ -303,6 +293,10 @@ static int hdlcd_drm_bind(struct device *dev)
>   	drm_mode_config_reset(drm);
>   	drm_kms_helper_poll_init(drm);
>   
> +#ifdef CONFIG_DEBUG_FS
> +	drm_debugfs_add_files(drm, hdlcd_debugfs_list, ARRAY_SIZE(hdlcd_debugfs_list));
> +#endif
> +
>   	ret = drm_dev_register(drm, 0);
>   	if (ret)
>   		goto err_register;