From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63CD7C3DA7D for ; Tue, 3 Jan 2023 13:49:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232989AbjACNtI (ORCPT ); Tue, 3 Jan 2023 08:49:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237476AbjACNtA (ORCPT ); Tue, 3 Jan 2023 08:49:00 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8FD39D2EF for ; Tue, 3 Jan 2023 05:48:59 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BE2F5152B for ; Tue, 3 Jan 2023 05:49:40 -0800 (PST) Received: from e110455-lin.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D837A3F587 for ; Tue, 3 Jan 2023 05:48:58 -0800 (PST) Date: Tue, 3 Jan 2023 13:48:54 +0000 From: Liviu Dudau To: =?utf-8?B?TWHDrXJh?= Canal Cc: David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?utf-8?B?QW5kcsOp?= Almeida , Tomi Valkeinen , Emma Anholt , Alexey Brodkin , etnaviv@lists.freedesktop.org, Gurchetan Singh , Melissa Wen , noralf@tronnes.org, Gerd Hoffmann , Russell King , David Airlie Subject: Re: [PATCH 3/9] drm/arm/hdlcd: use new debugfs device-centered functions Message-ID: References: <20221226155029.244355-1-mcanal@igalia.com> <20221226155029.244355-4-mcanal@igalia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20221226155029.244355-4-mcanal@igalia.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Dec 26, 2022 at 12:50:23PM -0300, 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 Acked-by: Liviu Dudau Best regards, Liviu > --- > 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; > -- > 2.38.1 > -- ==================== | I would like to | | fix the world, | | but they're not | | giving me the | \ source code! / --------------- ¯\_(ツ)_/¯