From: Maxime Ripard <mripard@kernel.org>
To: "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"David Airlie" <airlied@gmail.com>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Jonathan Corbet" <corbet@lwn.net>,
"Sandy Huang" <hjc@rock-chips.com>,
"Heiko Stübner" <heiko@sntech.de>, "Chen-Yu Tsai" <wens@csie.org>,
"Jernej Skrabec" <jernej.skrabec@gmail.com>,
"Samuel Holland" <samuel@sholland.org>,
"Andy Yan" <andy.yan@rock-chips.com>
Cc: "Hans Verkuil" <hverkuil@xs4all.nl>,
"Sebastian Wick" <sebastian.wick@redhat.com>,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
dri-devel@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
linux-rockchip@lists.infradead.org, linux-sunxi@lists.linux.dev,
"Maxime Ripard" <mripard@kernel.org>
Subject: [PATCH v12 23/28] drm/connector: hdmi: Create Infoframe DebugFS entries
Date: Tue, 23 Apr 2024 12:45:52 +0200 [thread overview]
Message-ID: <20240423-kms-hdmi-connector-state-v12-23-3338e4c0b189@kernel.org> (raw)
In-Reply-To: <20240423-kms-hdmi-connector-state-v12-0-3338e4c0b189@kernel.org>
There has been some discussions recently about the infoframes sent by
drivers and if they were properly generated.
In parallel, there's been some interest in creating an infoframe-decode
tool similar to edid-decode.
Both would be much easier if we were to expose the infoframes programmed
in the hardware. It won't be perfect since we have no guarantee that
it's actually what goes through the wire, but it's the best we can do.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/drm_debugfs.c | 152 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 152 insertions(+)
diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
index 08fcefd804bc..dd39a5b7a711 100644
--- a/drivers/gpu/drm/drm_debugfs.c
+++ b/drivers/gpu/drm/drm_debugfs.c
@@ -518,10 +518,160 @@ static const struct file_operations drm_connector_fops = {
.llseek = seq_lseek,
.release = single_release,
.write = connector_write
};
+#define HDMI_MAX_INFOFRAME_SIZE 29
+
+static ssize_t
+audio_infoframe_read(struct file *filp, char __user *ubuf, size_t count, loff_t *ppos)
+{
+ struct drm_connector_hdmi_infoframe *infoframe;
+ struct drm_connector *connector;
+ union hdmi_infoframe *frame;
+ u8 buf[HDMI_INFOFRAME_SIZE(AUDIO)];
+ ssize_t len = 0;
+
+ connector = filp->private_data;
+ mutex_lock(&connector->hdmi.infoframes.lock);
+
+ infoframe = &connector->hdmi.infoframes.audio;
+ if (!infoframe->set)
+ goto out;
+
+ frame = &infoframe->data;
+ len = hdmi_infoframe_pack(frame, buf, sizeof(buf));
+ if (len < 0)
+ goto out;
+
+ len = simple_read_from_buffer(ubuf, count, ppos, buf, len);
+
+out:
+ mutex_unlock(&connector->hdmi.infoframes.lock);
+ return len;
+}
+
+static const struct file_operations audio_infoframe_fops = {
+ .owner = THIS_MODULE,
+ .open = simple_open,
+ .read = audio_infoframe_read,
+};
+
+static int create_hdmi_audio_infoframe_file(struct drm_connector *connector,
+ struct dentry *parent)
+{
+ struct dentry *file;
+
+ file = debugfs_create_file("audio", 0400, parent, connector, &audio_infoframe_fops);
+ if (IS_ERR(file))
+ return PTR_ERR(file);
+
+ return 0;
+}
+
+#define DEFINE_INFOFRAME_FILE(_f) \
+static ssize_t _f##_read_infoframe(struct file *filp, \
+ char __user *ubuf, \
+ size_t count, \
+ loff_t *ppos) \
+{ \
+ struct drm_connector_hdmi_infoframe *infoframe; \
+ struct drm_connector_state *conn_state; \
+ struct drm_connector *connector; \
+ union hdmi_infoframe *frame; \
+ struct drm_device *dev; \
+ u8 buf[HDMI_MAX_INFOFRAME_SIZE]; \
+ ssize_t len = 0; \
+ \
+ connector = filp->private_data; \
+ dev = connector->dev; \
+ \
+ drm_modeset_lock(&dev->mode_config.connection_mutex, NULL); \
+ \
+ conn_state = connector->state; \
+ infoframe = &conn_state->hdmi.infoframes._f; \
+ if (!infoframe->set) \
+ goto out; \
+ \
+ frame = &infoframe->data; \
+ len = hdmi_infoframe_pack(frame, buf, sizeof(buf)); \
+ if (len < 0) \
+ goto out; \
+ \
+ len = simple_read_from_buffer(ubuf, count, ppos, buf, len); \
+ \
+out: \
+ drm_modeset_unlock(&dev->mode_config.connection_mutex); \
+ return len; \
+} \
+\
+static const struct file_operations _f##_infoframe_fops = { \
+ .owner = THIS_MODULE, \
+ .open = simple_open, \
+ .read = _f##_read_infoframe, \
+}; \
+\
+static int create_hdmi_## _f ## _infoframe_file (struct drm_connector *connector, \
+ struct dentry *parent) \
+{ \
+ struct dentry *file; \
+ \
+ file = debugfs_create_file(#_f, 0400, parent, connector, & _f ## _infoframe_fops); \
+ if (IS_ERR(file)) \
+ return PTR_ERR(file); \
+ \
+ return 0; \
+}
+
+DEFINE_INFOFRAME_FILE(avi);
+DEFINE_INFOFRAME_FILE(hdmi);
+DEFINE_INFOFRAME_FILE(hdr_drm);
+DEFINE_INFOFRAME_FILE(spd);
+
+static int create_hdmi_infoframe_files(struct drm_connector *connector,
+ struct dentry *parent)
+{
+ int ret;
+
+ ret = create_hdmi_audio_infoframe_file(connector, parent);
+ if (ret)
+ return ret;
+
+ ret = create_hdmi_avi_infoframe_file(connector, parent);
+ if (ret)
+ return ret;
+
+ ret = create_hdmi_hdmi_infoframe_file(connector, parent);
+ if (ret)
+ return ret;
+
+ ret = create_hdmi_hdr_drm_infoframe_file(connector, parent);
+ if (ret)
+ return ret;
+
+ ret = create_hdmi_spd_infoframe_file(connector, parent);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
+static void hdmi_debugfs_add(struct drm_connector *connector)
+{
+ struct dentry *dir;
+
+ if (!(connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
+ connector->connector_type == DRM_MODE_CONNECTOR_HDMIB))
+ return;
+
+ dir = debugfs_create_dir("infoframes", connector->debugfs_entry);
+ if (IS_ERR(dir))
+ return;
+
+ create_hdmi_infoframe_files(connector, dir);
+}
+
void drm_debugfs_connector_add(struct drm_connector *connector)
{
struct drm_device *dev = connector->dev;
struct dentry *root;
@@ -545,10 +695,12 @@ void drm_debugfs_connector_add(struct drm_connector *connector)
/* max bpc */
debugfs_create_file("output_bpc", 0444, root, connector,
&output_bpc_fops);
+ hdmi_debugfs_add(connector);
+
if (connector->funcs->debugfs_init)
connector->funcs->debugfs_init(connector, root);
}
void drm_debugfs_connector_remove(struct drm_connector *connector)
--
2.44.0
next prev parent reply other threads:[~2024-04-23 10:46 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-23 10:45 [PATCH v12 00/28] drm/connector: Create HDMI Connector infrastructure Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 01/28] drm/connector: Introduce an HDMI connector initialization function Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 02/28] drm/mode_object: Export drm_mode_obj_find_prop_id for tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 03/28] drm/tests: connector: Add tests for drmm_connector_hdmi_init Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 04/28] drm/connector: hdmi: Create an HDMI sub-state Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 05/28] drm/connector: hdmi: Add output BPC to the connector state Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 06/28] drm/tests: Add output bpc tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 07/28] drm/connector: hdmi: Add support for output format Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 08/28] drm/tests: Add output formats tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 09/28] drm/display: hdmi: Add HDMI compute clock helper Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 10/28] drm/tests: Add HDMI TDMS character rate tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 11/28] drm/connector: hdmi: Calculate TMDS character rate Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 12/28] drm/tests: Add TDMS character rate connector state tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 13/28] drm/connector: hdmi: Add custom hook to filter TMDS character rate Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 14/28] drm/tests: Add HDMI connector rate filter hook tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 15/28] drm/connector: hdmi: Compute bpc and format automatically Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 16/28] drm/tests: Add HDMI connector bpc and format tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 17/28] drm/connector: hdmi: Add Broadcast RGB property Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 18/28] drm/tests: Add tests for " Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 19/28] drm/connector: hdmi: Add RGB Quantization Range to the connector state Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 20/28] drm/tests: Add RGB Quantization tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 21/28] drm/connector: hdmi: Add Infoframes generation Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 22/28] drm/tests: Add infoframes test Maxime Ripard
2024-04-23 10:45 ` Maxime Ripard [this message]
2024-04-23 10:45 ` [PATCH v12 24/28] drm/vc4: hdmi: Switch to HDMI connector Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 25/28] drm/vc4: tests: Remove vc4_dummy_plane structure Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 26/28] drm/vc4: tests: Convert to plane creation helper Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 27/28] drm/rockchip: inno_hdmi: Switch to HDMI connector Maxime Ripard
2024-04-27 10:12 ` Andy Yan
2024-05-06 7:49 ` Maxime Ripard
2024-04-27 10:44 ` Andy Yan
2024-05-06 7:59 ` Maxime Ripard
2024-05-06 8:22 ` Andy Yan
2024-05-07 1:32 ` Andy Yan
2024-04-23 10:45 ` [PATCH v12 28/28] drm/sun4i: hdmi: " Maxime Ripard
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=20240423-kms-hdmi-connector-state-v12-23-3338e4c0b189@kernel.org \
--to=mripard@kernel.org \
--cc=airlied@gmail.com \
--cc=andy.yan@rock-chips.com \
--cc=corbet@lwn.net \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=hverkuil@xs4all.nl \
--cc=jernej.skrabec@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=maarten.lankhorst@linux.intel.com \
--cc=samuel@sholland.org \
--cc=sebastian.wick@redhat.com \
--cc=tzimmermann@suse.de \
--cc=ville.syrjala@linux.intel.com \
--cc=wens@csie.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).