Received: by 2002:ab2:6203:0:b0:1f5:f2ab:c469 with SMTP id o3csp2854168lqt; Tue, 23 Apr 2024 03:52:15 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXS7IpwsuifkTCGkrfzO0KMIVTM3nMdJvKVgoyJr14gtyfgDbX6HzaAtRqCT+dZmtBDHFH/QNcBezK0L8nmvhFpI1OmQHgTfp5pM8xA9g== X-Google-Smtp-Source: AGHT+IEqQfqTGR88nvr2PXjXjhy6mSFvDVE/DQCzvNQ8klczY6ejmemBLSY78UT8vJwKWIxgshsM X-Received: by 2002:a17:907:868d:b0:a58:86f8:410d with SMTP id qa13-20020a170907868d00b00a5886f8410dmr2165ejc.23.1713869534945; Tue, 23 Apr 2024 03:52:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713869534; cv=pass; d=google.com; s=arc-20160816; b=Y37c7XzzYuxsFtdtn2/CJpFh4nB3qjhjUlNhrsJEKNaDAFAvMZlSNJNlv4JiVl9sLt hYBlBC1G7tM8vsctjyjxZz74JBC7PfDs4kOAqI3g6vHTvgnHiDFdpiwvA5UImSOSKL3c Ln99VtZKl1kTKSg0ZQJVllqRpYTOQF6llMeI1jE1JxB9L7PEft0aImN61EPcTbC9K4OR CsaNOtMgohlEzzxG6WwzPrGyhKnORpU4atM5fdBsyQIT603GWdyv0IxouXo9NlJQOACm N3QTwdX7w8yXJKHoKVKD7xfPJBXAwDJ4RKWSyJTzwgb0EtvcR10319ednuIXOB+nXFuv Zf7w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=wmBRt1GKGicInBcqkUAERp48+tkz1sI21BBdQ0dgMLs=; fh=cXjl/YXY5UINzzOsrRmPCeOXLg/YFLu10NI0gaKdyKc=; b=deZIjz4pm6YV/i6Te/iEcfX1wFjWN3jjaIMS5tMyNfqJePunoUwiAX0YheX/lV6wqK CuxfYijRx2N0iqOGcLWrKHSWBoW0gwcngC8cLqO2wchcu3uvspWbwuSCKjNT39ncTPRL BB3URLXsrJE7SoIiwmGbsaDlTWNnOrMtNSpcnr/FBiPljtsnrRTnV+HzkCvVD6YhdOos d3vfvLDKm6WcOUeH1N1ZPpBdmQPxx77RMAON9Tj+Srb1E9tWvzHolwXjfBLKD81XNP8+ OEK2oUaQzdenz9PK9qaUMH1nqX0Sw9xlPGOTZ01qIzZ08LENG9hZc8vGpqCIa/idscg6 9uLg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=aFdzmB31; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-154915-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-154915-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id k6-20020a170906680600b00a58725bc336si1374311ejr.440.2024.04.23.03.52.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Apr 2024 03:52:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-154915-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=aFdzmB31; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-154915-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-154915-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 51B841F21253 for ; Tue, 23 Apr 2024 10:52:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 02F5513AD3B; Tue, 23 Apr 2024 10:46:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="aFdzmB31" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E74E0139CED; Tue, 23 Apr 2024 10:46:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713869211; cv=none; b=pWwzwVR4ZCL7O2JBw8fUNAG8M106x/bwhS0mGXeHClt8/4OH7nKbN90uu0qAUGboXW4Q30JvwJVtODlCrMO4O0fm0m5wH9YK/hAGaLC6IEYW6mb3pRC6HrbSwLQcjKh57MIon3W3+LHDfPtg5u4ZqioG/y5QjFanqQ3AO+tqbDo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713869211; c=relaxed/simple; bh=yBVGbOn1bf7ryiz3KRf1IjjU0UqAVQczNOu1n0TpvrU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BWAPaTPMsydxtm0MZb0YeTVlcklEnImgXF0C8yozldwZdIUV89nMrVrsz/0boUirVToEhivRnO7s9oLJhNlaqw18ancl2D4Zi9TQfVuE+iu/i5FlOTYP4v8GH+imJx9C0VUlq19ETBnjEIeuSTX5Hmkz14KKZLnmcdfs56/x7VE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aFdzmB31; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1DF05C2BD11; Tue, 23 Apr 2024 10:46:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713869210; bh=yBVGbOn1bf7ryiz3KRf1IjjU0UqAVQczNOu1n0TpvrU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=aFdzmB31TWK3HyErEcJhUWl4Kviv2rIPrMuB/zl0MCNTX07Qw7kKuDtUXAsXM9qax bb2eY2bbL3zoVxfvQNeyuiBcZFijfG3VXnYac/r1hNH+m2VxLgfkx+hB8Nv1P2fOjm UQAbN7XTEUiTLyX5ICX1TnN4Pb10BV/psEntuoxVzEu8NUHQEMcMc1eKkkVtiAg/j5 mTi9ToEa8g+S8NZYrgKxTh+oMF1W2JNDuvYwW6SBGJb2PjoprQVo5Kr1NNapDZl0h/ T8cBd8ET4BANlFfbQpEbw2tTAH4BgfoQ/89HbbndHswycvx9PQDUHp3hMOdOy9lHcY s4ZKdCE63QRdA== From: Maxime Ripard Date: Tue, 23 Apr 2024 12:45:52 +0200 Subject: [PATCH v12 23/28] drm/connector: hdmi: Create Infoframe DebugFS entries Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240423-kms-hdmi-connector-state-v12-23-3338e4c0b189@kernel.org> References: <20240423-kms-hdmi-connector-state-v12-0-3338e4c0b189@kernel.org> In-Reply-To: <20240423-kms-hdmi-connector-state-v12-0-3338e4c0b189@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Daniel Vetter , Jonathan Corbet , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Andy Yan Cc: Hans Verkuil , Sebastian Wick , =?utf-8?q?Ville_Syrj=C3=A4l=C3=A4?= , 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 X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=5419; i=mripard@kernel.org; h=from:subject:message-id; bh=yBVGbOn1bf7ryiz3KRf1IjjU0UqAVQczNOu1n0TpvrU=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDGnqE0NNu/LKxL+yvV55zuny+QTpOeafMw7ci4wzXfzu/ 9pr9ZYqHVNZGIQ5GWTFFFmeyISdXt6+uMrBfuUPmDmsTCBDGLg4BWAi3NqMDS16plIWUw1WHmcL bC49kmdUejxl9ts/m5afmcX473fh2rbZy9tDX+wsmFg/oUgoMCxWmLFh0/lDV89e/2S+YedyB4n rbs4C2s8fNE35/irP51nf0we7T/TZOh9NDOz1WrzjNftLRVk7AA== X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D 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 --- 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