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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 94C98C19F2E for ; Thu, 27 Feb 2025 08:56:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1BDAE10EA74; Thu, 27 Feb 2025 08:56:21 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="bcVSPr5A"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2B58D10EA74 for ; Thu, 27 Feb 2025 08:56:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1740646579; x=1772182579; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=NmyNVpOEA4NZSPEjTXVxjMre3p87YQf4hY+AnwQy/MU=; b=bcVSPr5AlY4LJ1oOBxKArH/KegLn4rY5KO4syL8ij1qd1cAF0qHmoj2k tY/ofNRkLeuIlU8eUz8BSBQDjsj90e92pxQwuakFgQnRfeD0S+beYc96B GkCGLm7lFWa8Yw8ta1YoV7okKHUm7SlYgMHy2O5i/6ZYxGlLNiRW6jL/N TYWQpt8MHO2lm8YSq6pnSfyOenWqD3d/wdooV0oUdVSdwx0cAZG1UxVTQ 0+F+46lEphhifC8dBMwhLmR0qA7nZf2Ihjt3fj1wbamQovMPaQeYxfF97 48o0a1503PQT+5t185vCQY9xA6H21H0NWIl8S/2GEoeNlSU87PpS/6WSp g==; X-CSE-ConnectionGUID: T/lkUUqfSw6XI7gOljCQlQ== X-CSE-MsgGUID: daXQgLxeQlS93dcmi/YQlQ== X-IronPort-AV: E=McAfee;i="6700,10204,11357"; a="45438626" X-IronPort-AV: E=Sophos;i="6.13,319,1732608000"; d="scan'208";a="45438626" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2025 00:56:19 -0800 X-CSE-ConnectionGUID: NZGzfWmKQyqX2S402WngRw== X-CSE-MsgGUID: 3oh0WbbgTpWB3Vs/QIfuiw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,319,1732608000"; d="scan'208";a="121973960" Received: from lfiedoro-mobl.ger.corp.intel.com (HELO localhost) ([10.245.246.181]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2025 00:56:13 -0800 From: Jani Nikula To: Luca Ceresoli , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: Dmitry Baryshkov , Thomas Petazzoni , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Luca Ceresoli Subject: Re: [PATCH v8 1/2] drm/bridge: move bridges_show logic from drm_debugfs.c In-Reply-To: <20250226-drm-debugfs-show-all-bridges-v8-1-bb511cc49d83@bootlin.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20250226-drm-debugfs-show-all-bridges-v8-0-bb511cc49d83@bootlin.com> <20250226-drm-debugfs-show-all-bridges-v8-1-bb511cc49d83@bootlin.com> Date: Thu, 27 Feb 2025 10:56:09 +0200 Message-ID: <87a5a74vh2.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Wed, 26 Feb 2025, Luca Ceresoli wrote: > In preparation to expose more info about bridges in debugfs, which will > require more insight into drm_bridge data structures, move the bridges_show > code to drm_bridge.c. > > Suggested-by: Jani Nikula > Suggested-by: Dmitry Baryshkov > Signed-off-by: Luca Ceresoli > > --- > > Changed in v8: > - add the file in drm_bridge.c, which avois the added #if CONFIG_DEBUG_FS > > This patch was added in v7. > --- > drivers/gpu/drm/drm_bridge.c | 42 ++++++++++++++++++++++++++++++++++++++++++ > drivers/gpu/drm/drm_debugfs.c | 38 +------------------------------------- > include/drm/drm_bridge.h | 2 ++ > 3 files changed, 45 insertions(+), 37 deletions(-) > > diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c > index 241a384ebce39b4a3db58c208af27960904fc662..a6bf1a565e3c3a8d24de60448972849f6d86ba72 100644 > --- a/drivers/gpu/drm/drm_bridge.c > +++ b/drivers/gpu/drm/drm_bridge.c > @@ -21,6 +21,7 @@ > * DEALINGS IN THE SOFTWARE. > */ > > +#include > #include > #include > #include > @@ -1335,6 +1336,47 @@ struct drm_bridge *of_drm_find_bridge(struct device_node *np) > EXPORT_SYMBOL(of_drm_find_bridge); > #endif > > +static int encoder_bridges_show(struct seq_file *m, void *data) > +{ > + struct drm_encoder *encoder = m->private; > + struct drm_printer p = drm_seq_file_printer(m); > + struct drm_bridge *bridge; > + unsigned int idx = 0; > + > + drm_for_each_bridge_in_chain(encoder, bridge) { > + drm_printf(&p, "bridge[%u]: %ps\n", idx++, bridge->funcs); > + drm_printf(&p, "\ttype: [%d] %s\n", > + bridge->type, > + drm_get_connector_type_name(bridge->type)); > + > + if (bridge->of_node) > + drm_printf(&p, "\tOF: %pOFfc\n", bridge->of_node); > + > + drm_printf(&p, "\tops: [0x%x]", bridge->ops); > + if (bridge->ops & DRM_BRIDGE_OP_DETECT) > + drm_puts(&p, " detect"); > + if (bridge->ops & DRM_BRIDGE_OP_EDID) > + drm_puts(&p, " edid"); > + if (bridge->ops & DRM_BRIDGE_OP_HPD) > + drm_puts(&p, " hpd"); > + if (bridge->ops & DRM_BRIDGE_OP_MODES) > + drm_puts(&p, " modes"); > + if (bridge->ops & DRM_BRIDGE_OP_HDMI) > + drm_puts(&p, " hdmi"); > + drm_puts(&p, "\n"); > + } > + > + return 0; > +} > +DEFINE_SHOW_ATTRIBUTE(encoder_bridges); > + > +void drm_bridge_debugfs_encoder_params(struct dentry *root, > + struct drm_encoder *encoder) > +{ > + /* bridges list */ > + debugfs_create_file("bridges", 0444, root, encoder, &encoder_bridges_fops); The function could look at encoder->debugfs_entry instead of requiring the root parameter, but that's neither here nor there. Reviewed-by: Jani Nikula > +} > + > MODULE_AUTHOR("Ajay Kumar "); > MODULE_DESCRIPTION("DRM bridge infrastructure"); > MODULE_LICENSE("GPL and additional rights"); > diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c > index 6b2178864c7ee12db9aa1f562e106b2f604439f8..3dfd8b34dceb7a5b8f11e3072a1eaef430869722 100644 > --- a/drivers/gpu/drm/drm_debugfs.c > +++ b/drivers/gpu/drm/drm_debugfs.c > @@ -740,40 +740,6 @@ void drm_debugfs_crtc_remove(struct drm_crtc *crtc) > crtc->debugfs_entry = NULL; > } > > -static int bridges_show(struct seq_file *m, void *data) > -{ > - struct drm_encoder *encoder = m->private; > - struct drm_printer p = drm_seq_file_printer(m); > - struct drm_bridge *bridge; > - unsigned int idx = 0; > - > - drm_for_each_bridge_in_chain(encoder, bridge) { > - drm_printf(&p, "bridge[%u]: %ps\n", idx++, bridge->funcs); > - drm_printf(&p, "\ttype: [%d] %s\n", > - bridge->type, > - drm_get_connector_type_name(bridge->type)); > - > - if (bridge->of_node) > - drm_printf(&p, "\tOF: %pOFfc\n", bridge->of_node); > - > - drm_printf(&p, "\tops: [0x%x]", bridge->ops); > - if (bridge->ops & DRM_BRIDGE_OP_DETECT) > - drm_puts(&p, " detect"); > - if (bridge->ops & DRM_BRIDGE_OP_EDID) > - drm_puts(&p, " edid"); > - if (bridge->ops & DRM_BRIDGE_OP_HPD) > - drm_puts(&p, " hpd"); > - if (bridge->ops & DRM_BRIDGE_OP_MODES) > - drm_puts(&p, " modes"); > - if (bridge->ops & DRM_BRIDGE_OP_HDMI) > - drm_puts(&p, " hdmi"); > - drm_puts(&p, "\n"); > - } > - > - return 0; > -} > -DEFINE_SHOW_ATTRIBUTE(bridges); > - > void drm_debugfs_encoder_add(struct drm_encoder *encoder) > { > struct drm_minor *minor = encoder->dev->primary; > @@ -789,9 +755,7 @@ void drm_debugfs_encoder_add(struct drm_encoder *encoder) > > encoder->debugfs_entry = root; > > - /* bridges list */ > - debugfs_create_file("bridges", 0444, root, encoder, > - &bridges_fops); > + drm_bridge_debugfs_encoder_params(root, encoder); > > if (encoder->funcs && encoder->funcs->debugfs_init) > encoder->funcs->debugfs_init(encoder, root); > diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h > index 496dbbd2ad7edff7f091adfbe62de1e33ef0cf07..0890acfe04b99b1ccbbff10b507cb8c2b2705e06 100644 > --- a/include/drm/drm_bridge.h > +++ b/include/drm/drm_bridge.h > @@ -1108,4 +1108,6 @@ static inline struct drm_bridge *drmm_of_get_bridge(struct drm_device *drm, > } > #endif > > +void drm_bridge_debugfs_encoder_params(struct dentry *root, struct drm_encoder *encoder); > + > #endif -- Jani Nikula, Intel