[09/13] drm/sti: Use the crtc's debugfs infrastructure

Message ID	20230111173748.752659-10-mcanal@igalia.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <dri-devel-bounces@lists.freedesktop.org> From: =?utf-8?q?Ma=C3=ADra_Canal?= <mcanal@igalia.com> To: Maxime Ripard <mripard@kernel.org>, Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Thomas Zimmermann <tzimmermann@suse.de>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, Jani Nikula <jani.nikula@linux.intel.com>, Alain Volmat <alain.volmat@foss.st.com> Subject: [PATCH 09/13] drm/sti: Use the crtc's debugfs infrastructure Date: Wed, 11 Jan 2023 14:37:44 -0300 Message-Id: <20230111173748.752659-10-mcanal@igalia.com> In-Reply-To: <20230111173748.752659-1-mcanal@igalia.com> References: <20230111173748.752659-1-mcanal@igalia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: list Cc: Melissa Wen <mwen@igalia.com>, =?utf-8?q?Ma=C3=ADra_Canal?= <mcanal@igalia.com>, =?utf-8?q?Andr=C3=A9_Alme?= =?utf-8?q?ida?= <andrealmeid@igalia.com>, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
Series	drm/debugfs: Create a debugfs infrastructure for kms objects \| expand [00/13] drm/debugfs: Create a debugfs infrastructure for kms objects [01/13] drm/debugfs: Create helper to add debugfs files to device's list [02/13] drm/debugfs: Create helper to create debugfs files from list [03/13] drm/debugfs: Create a debugfs infrastructure for connectors [04/13] drm/debugfs: Create a debugfs infrastructure for encoders [05/13] drm/debugfs: Create a debugfs infrastructure for CRTC [06/13] drm/vc4: Split variable instantiation of vc4_debugfs_regset32() [07/13] drm/vc4: Use the encoders' debugfs infrastructure [08/13] drm/vc4: Use the crtc's debugfs infrastructure [09/13] drm/sti: Use the crtc's debugfs infrastructure [10/13] drm/sti: Use the connectors' debugfs infrastructure [11/13] drm/sti: Use the encoders' debugfs infrastructure [12/13] drm/debugfs: Remove the debugfs late register function [13/13] drm/todo: Update the debugfs clean up task

diff --git a/drivers/gpu/drm/sti/sti_compositor.c b/drivers/gpu/drm/sti/sti_compositor.c index 142a8e1b4436..822da9d2879c 100644 --- a/drivers/gpu/drm/sti/sti_compositor.c +++ b/drivers/gpu/drm/sti/sti_compositor.c @@ -44,17 +44,17 @@ static const struct sti_compositor_data stih407_compositor_data = { }; void sti_compositor_debugfs_init(struct sti_compositor *compo, - struct drm_minor *minor) + struct drm_crtc *crtc) { unsigned int i; for (i = 0; i < STI_MAX_VID; i++) if (compo->vid[i]) - vid_debugfs_init(compo->vid[i], minor); + vid_debugfs_init(compo->vid[i], crtc); for (i = 0; i < STI_MAX_MIXER; i++) if (compo->mixer[i]) - sti_mixer_debugfs_init(compo->mixer[i], minor); + sti_mixer_debugfs_init(compo->mixer[i], crtc); } static int sti_compositor_bind(struct device *dev, diff --git a/drivers/gpu/drm/sti/sti_compositor.h b/drivers/gpu/drm/sti/sti_compositor.h index 25bb01bdd013..f5e9a2e4b6b5 100644 --- a/drivers/gpu/drm/sti/sti_compositor.h +++ b/drivers/gpu/drm/sti/sti_compositor.h @@ -80,6 +80,6 @@ struct sti_compositor { }; void sti_compositor_debugfs_init(struct sti_compositor *compo, - struct drm_minor *minor); + struct drm_crtc *crtc); #endif diff --git a/drivers/gpu/drm/sti/sti_crtc.c b/drivers/gpu/drm/sti/sti_crtc.c index 3c7154f2d5f3..176c74db8bb7 100644 --- a/drivers/gpu/drm/sti/sti_crtc.c +++ b/drivers/gpu/drm/sti/sti_crtc.c @@ -318,7 +318,7 @@ static int sti_crtc_late_register(struct drm_crtc *crtc) struct sti_compositor *compo = dev_get_drvdata(mixer->dev); if (drm_crtc_index(crtc) == 0) - sti_compositor_debugfs_init(compo, crtc->dev->primary); + sti_compositor_debugfs_init(compo, crtc); return 0; } diff --git a/drivers/gpu/drm/sti/sti_mixer.c b/drivers/gpu/drm/sti/sti_mixer.c index 7e5f14646625..ce775c64db2e 100644 --- a/drivers/gpu/drm/sti/sti_mixer.c +++ b/drivers/gpu/drm/sti/sti_mixer.c @@ -147,8 +147,8 @@ static void mixer_dbg_mxn(struct seq_file *s, void *addr) static int mixer_dbg_show(struct seq_file *s, void *arg) { - struct drm_info_node *node = s->private; - struct sti_mixer *mixer = (struct sti_mixer *)node->info_ent->data; + struct drm_debugfs_crtc_entry *entry = s->private; + struct sti_mixer *mixer = (struct sti_mixer *)entry->file.data; seq_printf(s, "%s: (vaddr = 0x%p)", sti_mixer_to_str(mixer), mixer->regs); @@ -170,39 +170,18 @@ static int mixer_dbg_show(struct seq_file *s, void *arg) return 0; } -static struct drm_info_list mixer0_debugfs_files[] = { - { "mixer_main", mixer_dbg_show, 0, NULL }, -}; - -static struct drm_info_list mixer1_debugfs_files[] = { - { "mixer_aux", mixer_dbg_show, 0, NULL }, -}; - -void sti_mixer_debugfs_init(struct sti_mixer *mixer, struct drm_minor *minor) +void sti_mixer_debugfs_init(struct sti_mixer *mixer, struct drm_crtc *crtc) { - unsigned int i; - struct drm_info_list *mixer_debugfs_files; - int nb_files; - switch (mixer->id) { case STI_MIXER_MAIN: - mixer_debugfs_files = mixer0_debugfs_files; - nb_files = ARRAY_SIZE(mixer0_debugfs_files); + drm_debugfs_crtc_add_file(crtc, "mixer_main", mixer_dbg_show, mixer); break; case STI_MIXER_AUX: - mixer_debugfs_files = mixer1_debugfs_files; - nb_files = ARRAY_SIZE(mixer1_debugfs_files); + drm_debugfs_crtc_add_file(crtc, "mixer_aux", mixer_dbg_show, mixer); break; default: return; } - - for (i = 0; i < nb_files; i++) - mixer_debugfs_files[i].data = mixer; - - drm_debugfs_create_files(mixer_debugfs_files, - nb_files, - minor->debugfs_root, minor); } void sti_mixer_set_background_status(struct sti_mixer *mixer, bool enable) diff --git a/drivers/gpu/drm/sti/sti_mixer.h b/drivers/gpu/drm/sti/sti_mixer.h index ab06beb7b258..973f7058092b 100644 --- a/drivers/gpu/drm/sti/sti_mixer.h +++ b/drivers/gpu/drm/sti/sti_mixer.h @@ -58,7 +58,7 @@ int sti_mixer_active_video_area(struct sti_mixer *mixer, void sti_mixer_set_background_status(struct sti_mixer *mixer, bool enable); -void sti_mixer_debugfs_init(struct sti_mixer *mixer, struct drm_minor *minor); +void sti_mixer_debugfs_init(struct sti_mixer *mixer, struct drm_crtc *crtc); /* depth in Cross-bar control = z order */ #define GAM_MIXER_NB_DEPTH_LEVEL 6 diff --git a/drivers/gpu/drm/sti/sti_vid.c b/drivers/gpu/drm/sti/sti_vid.c index 2d818397918d..98f2f4c8c2db 100644 --- a/drivers/gpu/drm/sti/sti_vid.c +++ b/drivers/gpu/drm/sti/sti_vid.c @@ -92,8 +92,8 @@ static void vid_dbg_mst(struct seq_file *s, int val) static int vid_dbg_show(struct seq_file *s, void *arg) { - struct drm_info_node *node = s->private; - struct sti_vid *vid = (struct sti_vid *)node->info_ent->data; + struct drm_debugfs_crtc_entry *entry = s->private; + struct sti_vid *vid = (struct sti_vid *)entry->file.data; seq_printf(s, "VID: (vaddr= 0x%p)", vid->regs); @@ -120,20 +120,9 @@ static int vid_dbg_show(struct seq_file *s, void *arg) return 0; } -static struct drm_info_list vid_debugfs_files[] = { - { "vid", vid_dbg_show, 0, NULL }, -}; - -void vid_debugfs_init(struct sti_vid *vid, struct drm_minor *minor) +void vid_debugfs_init(struct sti_vid *vid, struct drm_crtc *crtc) { - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(vid_debugfs_files); i++) - vid_debugfs_files[i].data = vid; - - drm_debugfs_create_files(vid_debugfs_files, - ARRAY_SIZE(vid_debugfs_files), - minor->debugfs_root, minor); + drm_debugfs_crtc_add_file(crtc, "vid", vid_dbg_show, vid); } void sti_vid_commit(struct sti_vid *vid, diff --git a/drivers/gpu/drm/sti/sti_vid.h b/drivers/gpu/drm/sti/sti_vid.h index 991849ba50b5..a14577a8df48 100644 --- a/drivers/gpu/drm/sti/sti_vid.h +++ b/drivers/gpu/drm/sti/sti_vid.h @@ -26,6 +26,6 @@ void sti_vid_disable(struct sti_vid *vid); struct sti_vid *sti_vid_create(struct device *dev, struct drm_device *drm_dev, int id, void __iomem *baseaddr); -void vid_debugfs_init(struct sti_vid *vid, struct drm_minor *minor); +void vid_debugfs_init(struct sti_vid *vid, struct drm_crtc *crtc); #endif

[09/13] drm/sti: Use the crtc's debugfs infrastructure

Commit Message

Patch