From nobody Thu Jun 11 18:27:33 2026 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (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 53CAD3FADE8 for ; Thu, 11 Jun 2026 12:59:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781182741; cv=pass; b=Wo3Pr7cRXWG92dcJNly6NUzdd37nZ8LupLsVtF3AeOztQ4zn50z+rq+L/N2vEA7Zr7MqsGT/LioC0XsQW7eSX20f21HGTXEUGl/nmk5HP0nPW0oVgHRVyuFlwtp/+6VYKmOXHQhymxUHze3/F7qM/A3nIJN704jlIPLqrBwUuY0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781182741; c=relaxed/simple; bh=frx63+jfDmBBYBOCBHRfOBl3WKpJN8AMRg0pfp9oT4k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QErB/cs/mv/K4h9fTI65GGFtp0ulfKXpAaCKIeAOS5h1UVdjHn7W/HlK/ssAGqweBr8bpe1nmRzVJ67w3OtsBXktbV6Z5VPsY4u1jnh3RZ0EP1eYLiRP12jVhx7GnwRFRQshBAX1wY+l6LtyEWledNK976Ih4uth6rJFnX3z1tE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b=iCkbkcbm; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b="iCkbkcbm" ARC-Seal: i=1; a=rsa-sha256; t=1781182706; cv=none; d=zohomail.com; s=zohoarc; b=QAjaDICkk8t4a8kwJhjf5Dq48AbTZ1tjcYKiVARajl01N+uvNWkAwQrxva3TGlBTG72DsgvG77IMy4MoL2SnvKQKjrFT7q0nMDwA1G7zvZQT4xhcHHoSwuUl8vIEaMB/GUrnlNwdNjcFKljoX6OZ4Z68Cy4jJRGSrk5M+71o31g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781182706; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=kue3L97vjZlhQtA/r6hsnUxhLTp1oeMsrWqZR4znYjM=; b=S5DQX+z9VzOIZfthyjnpLeZGURdC53xno09EyH7GFS1eLPdgdPpcyfD9FzLtwXjQCJTWF0CWroZY41VS54dFj9AogWLsxTYeCqS32S2hcrMSlgEkI8dZ2a4zkfpcEICReTBwky/WqU6K8SGme57XhxkHLDKZj1dSetpZPQOR/vE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=nicolas.frattaroli@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1781182706; s=zohomail; d=collabora.com; i=nicolas.frattaroli@collabora.com; h=From:From:Date:Date:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Message-Id:References:In-Reply-To:To:To:Cc:Cc:Reply-To; bh=kue3L97vjZlhQtA/r6hsnUxhLTp1oeMsrWqZR4znYjM=; b=iCkbkcbmDAiIYKaKZ8jtfu1De2hphgXbkp4SLG+hT5dzr3WCGDIE09lfdNAMFdIs nN3rjU8RETR7kECFJzTjubkwETbYuGEw3+1001XsNFcNsZmlkRL5xVqOjal9Fbzmax7 N/hoFplhOfDEdc89nUphNyeQmMJctgYlQrDsBZ0Y= Received: by mx.zohomail.com with SMTPS id 1781182705476687.4119160959905; Thu, 11 Jun 2026 05:58:25 -0700 (PDT) From: Nicolas Frattaroli Date: Thu, 11 Jun 2026 14:57:57 +0200 Subject: [PATCH v6 1/4] drm/scdc-helper: Don't use ssize_t return type for scdc_read/write 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: quoted-printable Message-Id: <20260611-scdc-link-health-v6-1-6307875a6b5e@collabora.com> References: <20260611-scdc-link-health-v6-0-6307875a6b5e@collabora.com> In-Reply-To: <20260611-scdc-link-health-v6-0-6307875a6b5e@collabora.com> To: Jani Nikula , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Luca Ceresoli , Daniel Stone , Hans Verkuil Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel@collabora.com, Nicolas Frattaroli X-Mailer: b4 0.15.2 drm_scdc_read and drm_scdc_write, both of which are only used within drm_scdc_helper (although exported), use a ssize_t as their return type. This would make sense if they returned the number of bytes read/written on success, and negative errno otherwise. However, they return 0 on success. Demote them to "int" as their return type, in order to avoid needlessly using 64 bits when less suffices. No functional change. Reviewed-by: Luca Ceresoli Reviewed-by: Hans Verkuil Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/display/drm_scdc_helper.c | 8 ++++---- include/drm/display/drm_scdc_helper.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/display/drm_scdc_helper.c b/drivers/gpu/drm/di= splay/drm_scdc_helper.c index df878aad4a36..8403f2390ab6 100644 --- a/drivers/gpu/drm/display/drm_scdc_helper.c +++ b/drivers/gpu/drm/display/drm_scdc_helper.c @@ -67,8 +67,8 @@ * Returns: * 0 on success, negative error code on failure. */ -ssize_t drm_scdc_read(struct i2c_adapter *adapter, u8 offset, void *buffer, - size_t size) +int drm_scdc_read(struct i2c_adapter *adapter, u8 offset, void *buffer, + size_t size) { int ret; struct i2c_msg msgs[2] =3D { @@ -107,8 +107,8 @@ EXPORT_SYMBOL(drm_scdc_read); * Returns: * 0 on success, negative error code on failure. */ -ssize_t drm_scdc_write(struct i2c_adapter *adapter, u8 offset, - const void *buffer, size_t size) +int drm_scdc_write(struct i2c_adapter *adapter, u8 offset, const void *buf= fer, + size_t size) { struct i2c_msg msg =3D { .addr =3D SCDC_I2C_SLAVE_ADDRESS, diff --git a/include/drm/display/drm_scdc_helper.h b/include/drm/display/dr= m_scdc_helper.h index 34600476a1b9..e9ccaeba56dd 100644 --- a/include/drm/display/drm_scdc_helper.h +++ b/include/drm/display/drm_scdc_helper.h @@ -31,10 +31,10 @@ struct drm_connector; struct i2c_adapter; =20 -ssize_t drm_scdc_read(struct i2c_adapter *adapter, u8 offset, void *buffer, - size_t size); -ssize_t drm_scdc_write(struct i2c_adapter *adapter, u8 offset, - const void *buffer, size_t size); +int drm_scdc_read(struct i2c_adapter *adapter, u8 offset, void *buffer, + size_t size); +int drm_scdc_write(struct i2c_adapter *adapter, u8 offset, const void *buf= fer, + size_t size); =20 /** * drm_scdc_readb - read a single byte from SCDC --=20 2.54.0 From nobody Thu Jun 11 18:27:33 2026 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (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 53C113FADE7 for ; Thu, 11 Jun 2026 12:59:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781182741; cv=pass; b=iFoRyifHuHTisPbZoUydAZ6E0ZpQ5hyTXxhodqkbJk9DqWW83qEe1A+uvUB4HWGc/BH6r7uLG6YkAzwBMXW87Cmxuy5cs3C4pKEv8HUv3Qh8+9O6jH92dr8UOKrs1D9cPKOQvRtA4MJDDnepxwjY32J+s+1vTTCVlbhwoU64t+8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781182741; c=relaxed/simple; bh=rN6JX2uoLmzf/lL/FVoOhX7xgdMTZ4B+9V+gRGc8I5g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aui5aGLtguylhM9Gsn8TpNUVyao+2o/Ws2yBYxGsTnYHqUoe11VZhX6B1CcNhzx7zoU+qf66SPoNa6scGafU74ovKMy9nyxPwEa7BDDadwknqhhsiTYIldC6Sgr4B5e4JQSZPwOp//iQbx04Ax8ihZJTUrVH5B7K8cMV0hJN/zA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b=CSXYhMZp; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b="CSXYhMZp" ARC-Seal: i=1; a=rsa-sha256; t=1781182712; cv=none; d=zohomail.com; s=zohoarc; b=CekuzyceTxMH6mQIcaUuPOqwA93yMwpB+7vqmUNvPIBep/GrjSa7krs1liKk6lnq2zsRXaqMIdHD4g6zcocdH59a2mW3Mf4Vrm0N/Nn1yR8csBT9QAs7+PrFKXktk4lIn/ar4DXFKRHWXcHB04COK2U9Zi9c4JGz0NI1/KB758M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781182712; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=Yac5ahGC4EvmLqM2fCbmJlGN2UWLGRMdv3ZuCDCpAgU=; b=TcvNmhlZLjfHieam7re/+DkpoUHKpZqntIsRTvyZjcVhMqBjrGooboG9/hd3hQo9NidBr0/0igHQSjsrXOjLbC+MO26i3M9++MAUGY3Aw44RgSM8I6o3+lG6gxNvSGjhZ7IulfBs7pEs1wBN8glB+pzhv45EJUhiS9Oexb8vr6A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=nicolas.frattaroli@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1781182712; s=zohomail; d=collabora.com; i=nicolas.frattaroli@collabora.com; h=From:From:Date:Date:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Message-Id:References:In-Reply-To:To:To:Cc:Cc:Reply-To; bh=Yac5ahGC4EvmLqM2fCbmJlGN2UWLGRMdv3ZuCDCpAgU=; b=CSXYhMZp3Vy7JBQsRDVIA3zqWVp9f3ZdRLvgQuVjHjrFWbA3aeQp4cG1z50DfSCw GepPQMCo93Azeq9Rhr2ebWzbYdECNyCng2f/6Ld7KAorNSo5Uw43hrXzw3quxJAwl/X +vfnuxHTwxtShwK1Ptm2erhcabzrdWZG/yIKLbuU= Received: by mx.zohomail.com with SMTPS id 1781182710380250.6709979043684; Thu, 11 Jun 2026 05:58:30 -0700 (PDT) From: Nicolas Frattaroli Date: Thu, 11 Jun 2026 14:57:58 +0200 Subject: [PATCH v6 2/4] drm/scdc-helper: Add scdc_status debugfs entry 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: quoted-printable Message-Id: <20260611-scdc-link-health-v6-2-6307875a6b5e@collabora.com> References: <20260611-scdc-link-health-v6-0-6307875a6b5e@collabora.com> In-Reply-To: <20260611-scdc-link-health-v6-0-6307875a6b5e@collabora.com> To: Jani Nikula , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Luca Ceresoli , Daniel Stone , Hans Verkuil Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel@collabora.com, Nicolas Frattaroli X-Mailer: b4 0.15.2 SCDC provides status information on the current display link. At the very least, it may be useful to expose this info through debugfs. Add a debugfs entry for it under the connector, which displays a few more details parsed out of the SCDC registers. A new drm_scdc_debugfs_init function can be called by the connector implementation to initialise the debugfs file. Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/display/drm_scdc_helper.c | 184 ++++++++++++++++++++++++++= ++++ include/drm/display/drm_scdc_helper.h | 32 ++++++ 2 files changed, 216 insertions(+) diff --git a/drivers/gpu/drm/display/drm_scdc_helper.c b/drivers/gpu/drm/di= splay/drm_scdc_helper.c index 8403f2390ab6..5871fc101815 100644 --- a/drivers/gpu/drm/display/drm_scdc_helper.c +++ b/drivers/gpu/drm/display/drm_scdc_helper.c @@ -24,11 +24,14 @@ #include #include #include +#include #include +#include =20 #include #include #include +#include #include =20 /** @@ -55,6 +58,11 @@ =20 #define SCDC_I2C_SLAVE_ADDRESS 0x54 =20 +struct scdc_debugfs_priv { + struct drm_connector *connector; + struct drm_scdc_state state; +}; + /** * drm_scdc_read - read a block of data from SCDC * @adapter: I2C controller @@ -276,3 +284,179 @@ bool drm_scdc_set_high_tmds_clock_ratio(struct drm_co= nnector *connector, return true; } EXPORT_SYMBOL(drm_scdc_set_high_tmds_clock_ratio); + +static void +drm_scdc_parse_status0_flags(u8 val, struct drm_scdc_status_flags *flags) +{ + flags->clock_detected =3D val & SCDC_CLOCK_DETECT; + flags->ch0_locked =3D val & SCDC_CH0_LOCK; + flags->ch1_locked =3D val & SCDC_CH1_LOCK; + flags->ch2_locked =3D val & SCDC_CH2_LOCK; +} + +static int drm_scdc_parse_error_counters(const u8 scdc[256], u16 counter[3= ]) +{ + u8 sum =3D 0; + int i; + + for (i =3D SCDC_ERR_DET_0_L; i <=3D SCDC_ERR_DET_CHECKSUM ; i++) + sum =3D wrapping_add(u8, sum, scdc[i]); + + if (sum) + return -EPROTO; + + for (i =3D 0; i < 3; i++) { + if (scdc[SCDC_ERR_DET_0_H + i * 2] & SCDC_CHANNEL_VALID) + counter[i] =3D (scdc[SCDC_ERR_DET_0_H + i * 2] & + ~SCDC_CHANNEL_VALID) << 8 | + scdc[SCDC_ERR_DET_0_L + i * 2]; + else + counter[i] =3D 0; + } + + return 0; +} + +/** + * drm_scdc_read_state - Update state from SCDC + * @connector: pointer to a &struct drm_connector on which to operate on + * @state: pointer to a &struct drm_scdc_state to fill + * + * Reads the entire 256 byte SCDC state and parses it. + * + * Returns: %0 on success, negative errno on failure. + */ +int drm_scdc_read_state(struct drm_connector *connector, struct drm_scdc_s= tate *state) +{ + struct i2c_adapter *ddc; + struct drm_scdc *scdc; + u8 *buf =3D state->scdc; + int ret; + + if (!state || !connector) + return -ENODEV; + + scdc =3D &connector->display_info.hdmi.scdc; + ddc =3D connector->ddc; + + if (!scdc->supported) + return -EOPNOTSUPP; + + /* Read in 128-byte chunks, to work around DP<->HDMI converters with issu= es. */ + ret =3D drm_scdc_read(ddc, 0, buf, 128); + if (ret) + return ret; + + ret =3D drm_scdc_read(ddc, 128, &buf[128], 128); + if (ret) + return ret; + + state->scrambling_enabled =3D buf[SCDC_TMDS_CONFIG] & SCDC_SCRAMBLING_ENA= BLE; + state->tmds_bclk_x40 =3D buf[SCDC_TMDS_CONFIG] & SCDC_TMDS_BIT_CLOCK_RATI= O_BY_40; + + state->scrambling_detected =3D buf[SCDC_SCRAMBLER_STATUS] & SCDC_SCRAMBLI= NG_STATUS; + + drm_scdc_parse_status0_flags(buf[SCDC_STATUS_FLAGS_0], &state->stf); + ret =3D drm_scdc_parse_error_counters(buf, state->error_count); + if (ret) + return ret; + + return 0; +} +EXPORT_SYMBOL(drm_scdc_read_state); + +#define scdc_print_str(_f, key, s) \ + (seq_printf((_f), "%-30s: %s\n", (key), (s))) +#define scdc_print_flag(_f, key, val) \ + (scdc_print_str((_f), (key), str_yes_no((val)))) +#define scdc_print_dec(_f, key, val) \ + (seq_printf((_f), "%-30s: %d\n", (key), (val))) + +static int scdc_status_show(struct seq_file *m, void *data) +{ + struct scdc_debugfs_priv *priv =3D m->private; + struct drm_scdc_state *st =3D &priv->state; + struct drm_connector *connector =3D priv->connector; + struct drm_scdc *scdc =3D &connector->display_info.hdmi.scdc; + int i, ret; + + drm_connector_get(connector); + + if (connector->status !=3D connector_status_connected) { + ret =3D -ENODEV; + goto err_conn_put; + } + + if (scdc->supported) { + ret =3D drm_scdc_read_state(connector, st); + if (ret) + goto err_conn_put; + + for (i =3D 0; i < ARRAY_SIZE(st->scdc); i +=3D 16) + seq_printf(m, "%*ph\n", 16, &st->scdc[i]); + + seq_puts(m, "\n----------------\n\n"); + } + + scdc_print_flag(m, "SCDC Supported", scdc->supported); + if (!scdc->supported) { + ret =3D 0; + goto err_conn_put; + } + + scdc_print_flag(m, "Sink Read Request Capable", scdc->read_request); + scdc_print_flag(m, "Scrambling Supported", scdc->scrambling.supported); + scdc_print_flag(m, "Low Rate Scrambling Supported", scdc->scrambling.low_= rates); + + drm_connector_put(connector); + + scdc_print_flag(m, "Scrambling Enabled", st->scrambling_enabled); + scdc_print_flag(m, "Scrambling Detected", st->scrambling_detected); + + if (st->tmds_bclk_x40) + scdc_print_str(m, "TMDS Bit Clock Ratio", "1/40"); + else + scdc_print_str(m, "TMDS Bit Clock Ratio", "1/10"); + + scdc_print_flag(m, "Clock Detected", st->stf.clock_detected); + scdc_print_flag(m, "Channel 0 Locked", st->stf.ch0_locked); + scdc_print_flag(m, "Channel 1 Locked", st->stf.ch1_locked); + scdc_print_flag(m, "Channel 2 Locked", st->stf.ch2_locked); + + scdc_print_dec(m, "Channel 0 Errors", st->error_count[0]); + scdc_print_dec(m, "Channel 1 Errors", st->error_count[1]); + scdc_print_dec(m, "Channel 2 Errors", st->error_count[2]); + + return 0; + +err_conn_put: + drm_connector_put(connector); + + return ret; +} +DEFINE_SHOW_ATTRIBUTE(scdc_status); + +/** + * drm_scdc_debugfs_init - Initialize scdc files in connector debugfs + * @connector: pointer to &struct drm_connector to operate on + * @root: debugfs &struct dentry for the debugfs root of @connector + * + * Creates SCDC-related debugfs files for @connector. Must be called after + * @root is already created. + */ +void drm_scdc_debugfs_init(struct drm_connector *connector, struct dentry = *root) +{ + struct scdc_debugfs_priv *priv; + + if (!root || !connector) + return; + + priv =3D drmm_kzalloc(connector->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return; + + priv->connector =3D connector; + + debugfs_create_file("scdc_status", 0444, root, priv, &scdc_status_fops); +} +EXPORT_SYMBOL(drm_scdc_debugfs_init); diff --git a/include/drm/display/drm_scdc_helper.h b/include/drm/display/dr= m_scdc_helper.h index e9ccaeba56dd..e0b79d79e1ff 100644 --- a/include/drm/display/drm_scdc_helper.h +++ b/include/drm/display/drm_scdc_helper.h @@ -30,6 +30,34 @@ =20 struct drm_connector; struct i2c_adapter; +struct dentry; + +struct drm_scdc_status_flags { + /* Status Register 0 */ + bool clock_detected; + bool ch0_locked; + bool ch1_locked; + bool ch2_locked; +}; + +struct drm_scdc_state { + /** @stf: contents of the status flag registers */ + struct drm_scdc_status_flags stf; + /** @scramling_enabled: true if TMDS scrambling is on */ + bool scrambling_enabled; + /** @scrambling_detected: true if the sink actually detected scrambling */ + bool scrambling_detected; + /** + * @tmds_bclk_x40: true if TMDS bit period is 1/40th of the TMDS + * clock period, false if it's 1/10th of the clock period. + */ + bool tmds_bclk_x40; + /** @error_count: character error counts for each channel */ + u16 error_count[3]; + + /** @scdc: raw SCDC data buffer */ + u8 scdc[256]; +}; =20 int drm_scdc_read(struct i2c_adapter *adapter, u8 offset, void *buffer, size_t size); @@ -77,4 +105,8 @@ bool drm_scdc_get_scrambling_status(struct drm_connector= *connector); bool drm_scdc_set_scrambling(struct drm_connector *connector, bool enable); bool drm_scdc_set_high_tmds_clock_ratio(struct drm_connector *connector, b= ool set); =20 +int drm_scdc_read_state(struct drm_connector *connector, + struct drm_scdc_state *state); +void drm_scdc_debugfs_init(struct drm_connector *connector, struct dentry = *root); + #endif --=20 2.54.0 From nobody Thu Jun 11 18:27:33 2026 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (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 E18012DA76C for ; Thu, 11 Jun 2026 12:59:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781182742; cv=pass; b=AMXpqnGPb3fLovEu6Z7J4ksd5Jkg4+ZRZDUsXH/GNR1MdtMW2mScD728PNwWFE9gfKCKVxA/yPcOSz78WCHLZeAhpuPlPaulmutoJdrHyG9pwNJLXfPguD42hB//uncP/T8ERvNvlRrzKRFcatvY/oRBiWnxVGcqNCf+2kFiYLA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781182742; c=relaxed/simple; bh=p0GXFJgZsv62MGwxIs0FgZvyxN6rLcgFNbmTe3m+JeM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BpKJiOLuaMVqiuQ9q1waSttnQTaFRYtDacHFQHZalGALZ8rAiEDd69FI8ypJ1HpcxRLLYX5wOVL3by3HHowtDjh+HOoi4JIGWlqqH8pWGP5XUgF3E1hL1/OI9K0ZE3zKa3+MFXD7gZ6sljlAUYbEWxA3cv6egjVlryZ0dikI/Cw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b=CVTEFQq6; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b="CVTEFQq6" ARC-Seal: i=1; a=rsa-sha256; t=1781182716; cv=none; d=zohomail.com; s=zohoarc; b=CW6FMa2rvRcxaam8+V8C6uwnZhO/hbEiK2ZFq3P7FVctzt/PsnhuBkGj/tKQj/SyYvSBWeaylxGo2Px48VGNk0YfziYwRwkstOF1PWz+vUrT4I/46xbGBUkzakR0yVzuWwuibH9s+CSsFdgfvFGtoa1VndLi+fN41RrASnUaTZ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781182716; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=G6p3bR3EbKYaAGni7SnlEEMnAMIZEyJiafCNQAgRzpU=; b=HO1/iPSngmIfltD6GPqR3dYlL8mP7nTc64rZm5+D4R5KNhyNZsyCw5gwbwRu0cuSZs2/5FKOmXtVXM2e93C3Zt52Ljo2KGCc+1G3wahWi171HuDqvcWoL96LBt+tLijykY+AiMQCmTNuhxJc3/pkXtY3ca1FLuuC/f7vk6p+5ws= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=nicolas.frattaroli@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1781182716; s=zohomail; d=collabora.com; i=nicolas.frattaroli@collabora.com; h=From:From:Date:Date:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Message-Id:References:In-Reply-To:To:To:Cc:Cc:Reply-To; bh=G6p3bR3EbKYaAGni7SnlEEMnAMIZEyJiafCNQAgRzpU=; b=CVTEFQq6E/G1KZEfYMUE37wBzgGv9r39js5E+edBiR9NRZNlmKLBYQEtZPFpSVD+ tROp64Zxoz8CJTDQkl/YEGVqPPqy7PtjiGXsFKXWNqEw1zQ5Lt/aHU/E4bIAJ5hvJwI nxg1oujRpuUdYMeV5vzDsMIOqyR4sO1JyLFYxYQo= Received: by mx.zohomail.com with SMTPS id 1781182715566534.2719904444058; Thu, 11 Jun 2026 05:58:35 -0700 (PDT) From: Nicolas Frattaroli Date: Thu, 11 Jun 2026 14:57:59 +0200 Subject: [PATCH v6 3/4] drm/display: bridge_connector: init scdc debugfs for HDMI 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: quoted-printable Message-Id: <20260611-scdc-link-health-v6-3-6307875a6b5e@collabora.com> References: <20260611-scdc-link-health-v6-0-6307875a6b5e@collabora.com> In-Reply-To: <20260611-scdc-link-health-v6-0-6307875a6b5e@collabora.com> To: Jani Nikula , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Luca Ceresoli , Daniel Stone , Hans Verkuil Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel@collabora.com, Nicolas Frattaroli , Daniel Stone X-Mailer: b4 0.15.2 On drm_bridge_connectors that contain an HDMI bridge, initialise the SCDC debugfs entry under the connector's debugfs root. Reviewed-by: Daniel Stone Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/display/drm_bridge_connector.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/d= rm/display/drm_bridge_connector.c index 92f8a2d7aab4..c081a4880317 100644 --- a/drivers/gpu/drm/display/drm_bridge_connector.c +++ b/drivers/gpu/drm/display/drm_bridge_connector.c @@ -25,6 +25,7 @@ #include #include #include +#include =20 /** * DOC: overview @@ -263,6 +264,9 @@ static void drm_bridge_connector_debugfs_init(struct dr= m_connector *connector, if (bridge->funcs->debugfs_init) bridge->funcs->debugfs_init(bridge, root); } + + if (bridge_connector->bridge_hdmi) + drm_scdc_debugfs_init(connector, root); } =20 static struct drm_connector_state * --=20 2.54.0 From nobody Thu Jun 11 18:27:33 2026 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (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 D46CA3FBB69 for ; Thu, 11 Jun 2026 12:59:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781182752; cv=pass; b=sKIhk4jJoxvIKQ3709EnxrIDTsMupIJxoK0THYHqlsFeKp19eSrNY04OtugnyKCr5BP6AKQuAajXOUReIhYLE9po6TQIi9Gb+W/k85v6SSpHNesp4jxUNRw/7c8zj0jd6zwAQ+Nb84CpBCIpA1TPzFgjLZS/tHWXFrSbJ8Z1G9Q= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781182752; c=relaxed/simple; bh=B1JtMwiN6ywR/UDeNycanBV3ykjsaPm+gRqovNIQmpU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=B+pzQYEdi0BsV8C1Gs8YE0C7T7hpsG0N3i9WEl4v/pOlcmKqG51UDmAQbz+AOcdWFDBGm+h6thwvT8ZcudScD+mf37ANlRsyidZp8O0f3UDmtIfGFabBG0Whs1qVWQH0T7DTMnS0q3SDCC1l437VtC8JZdFtJed0eCWj0DYrTBc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b=AafohA/s; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b="AafohA/s" ARC-Seal: i=1; a=rsa-sha256; t=1781182722; cv=none; d=zohomail.com; s=zohoarc; b=fyGYDhgLFN9mnjc4KzmYCjmP3SazROhVcFazrBOmC1gUyobsuRx1WqMpvt2EguslJcpzAgcFVNHAyXBFEmJ+FjMAeuUMquVMNO0Vx6Tpn+WW9aGo357/FwLLLvj3uYsfkYsKwVWzH1VypydBlABnGuz+K+Cnjgp7QGTHjWecrwM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781182722; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=7qUu+jycvf+ABk4ONLuybC/X4x8luOUhDhxi7RxZArw=; b=OfoFa2PqJvxGB6dTRUzvhhDcbDiynhH6hLceiOdthQISW418R4bCJPv2HHQA1KB7RuV2r63ZYAGlNGvowi9y4x/97NbTAekgYDWazFGtKzEEOsLEgagXL1uH1XzONG8c5xqa62lhJejAi0zCpdEllALPAo8khb+SNjkI0wLRrFo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=nicolas.frattaroli@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1781182722; s=zohomail; d=collabora.com; i=nicolas.frattaroli@collabora.com; h=From:From:Date:Date:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Message-Id:References:In-Reply-To:To:To:Cc:Cc:Reply-To; bh=7qUu+jycvf+ABk4ONLuybC/X4x8luOUhDhxi7RxZArw=; b=AafohA/sEd/45x3ZKk6YVX6KLeJ67UjEGKbuDQtu5r43cw2ru+7G+ADl5ubLhOJw OJtTtGIijHi9n/KJHXa1RJe8TnGlJQsNMZzW4LXd+XezitWgKj4Wo+80we5GFu/pxUB ysb+Eys63Lff7rKnoyi87kfxGWBTPtsIW/UBd1qs= Received: by mx.zohomail.com with SMTPS id 1781182720481259.17653652195077; Thu, 11 Jun 2026 05:58:40 -0700 (PDT) From: Nicolas Frattaroli Date: Thu, 11 Jun 2026 14:58:00 +0200 Subject: [PATCH v6 4/4] drm/scdc-helper: Implement parsing and printing HDMI 2.1 fields 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: quoted-printable Message-Id: <20260611-scdc-link-health-v6-4-6307875a6b5e@collabora.com> References: <20260611-scdc-link-health-v6-0-6307875a6b5e@collabora.com> In-Reply-To: <20260611-scdc-link-health-v6-0-6307875a6b5e@collabora.com> To: Jani Nikula , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Luca Ceresoli , Daniel Stone , Hans Verkuil Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel@collabora.com, Nicolas Frattaroli X-Mailer: b4 0.15.2 HDMI 2.1 redefines previously reserved fields in SCDC for various new uses. No version check needs to be performed, as an HDMI 2.0 sink's reserved SCDC fields are well-defined to be 0, and any zero-ness of these fields for an HDMI 2.0 sink is not a surprise for SCDC parsers for HDMI 2.1. Implement reading and outputting these fields over debugfs. Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/display/drm_scdc_helper.c | 99 +++++++++++++++++++++++++++= +++- include/drm/display/drm_scdc.h | 21 ++++++- include/drm/display/drm_scdc_helper.h | 69 ++++++++++++++++++++- 3 files changed, 182 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/display/drm_scdc_helper.c b/drivers/gpu/drm/di= splay/drm_scdc_helper.c index 5871fc101815..7e17272d52f2 100644 --- a/drivers/gpu/drm/display/drm_scdc_helper.c +++ b/drivers/gpu/drm/display/drm_scdc_helper.c @@ -21,6 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ =20 +#include #include #include #include @@ -63,6 +64,38 @@ struct scdc_debugfs_priv { struct drm_scdc_state state; }; =20 +static const char *drm_scdc_frl_rate_str(enum drm_scdc_frl_rate rate) +{ + switch (rate) { + case SCDC_FRL_RATE_OFF: + return "Off"; + case SCDC_FRL_RATE_3X3: + return "3 Gbit/s x 3 lanes"; + case SCDC_FRL_RATE_6X3: + return "6 Gbit/s x 3 lanes"; + case SCDC_FRL_RATE_6X4: + return "6 Gbit/s x 4 lanes"; + case SCDC_FRL_RATE_8X4: + return "8 Gbit/s x 4 lanes"; + case SCDC_FRL_RATE_10X4: + return "10 Gbit/s x 4 lanes"; + case SCDC_FRL_RATE_12X4: + return "12 Gbit/s x 4 lanes"; + case SCDC_FRL_RATE_RESV_7: + case SCDC_FRL_RATE_RESV_8: + case SCDC_FRL_RATE_RESV_9: + case SCDC_FRL_RATE_RESV_10: + case SCDC_FRL_RATE_RESV_11: + case SCDC_FRL_RATE_RESV_12: + case SCDC_FRL_RATE_RESV_13: + case SCDC_FRL_RATE_RESV_14: + case SCDC_FRL_RATE_RESV_15: + return "(Reserved)"; + default: + return NULL; + } +} + /** * drm_scdc_read - read a block of data from SCDC * @adapter: I2C controller @@ -292,14 +325,41 @@ drm_scdc_parse_status0_flags(u8 val, struct drm_scdc_= status_flags *flags) flags->ch0_locked =3D val & SCDC_CH0_LOCK; flags->ch1_locked =3D val & SCDC_CH1_LOCK; flags->ch2_locked =3D val & SCDC_CH2_LOCK; + flags->ln3_locked =3D val & SCDC_LN3_LOCK; + flags->flt_ready =3D val & SCDC_FLT_READY; + flags->dsc_fail =3D val & SCDC_DSC_FAIL; +} + +static void +drm_scdc_parse_status1_2_flags(u8 val_flag1, u8 val_flag2, + struct drm_scdc_status_flags *flags) +{ + flags->ln0_training_pattern =3D FIELD_GET(SCDC_LN_EVEN_TRAIN_PTRN, val_fl= ag1); + flags->ln1_training_pattern =3D FIELD_GET(SCDC_LN_ODD_TRAIN_PTRN, val_fla= g1); + + flags->ln2_training_pattern =3D FIELD_GET(SCDC_LN_EVEN_TRAIN_PTRN, val_fl= ag2); + flags->ln3_training_pattern =3D FIELD_GET(SCDC_LN_ODD_TRAIN_PTRN, val_fla= g2); } =20 -static int drm_scdc_parse_error_counters(const u8 scdc[256], u16 counter[3= ]) +static int drm_scdc_parse_error_counters(const u8 scdc[256], u16 counter[4= ], + unsigned int num_lanes) { + u8 end_reg; u8 sum =3D 0; int i; =20 - for (i =3D SCDC_ERR_DET_0_L; i <=3D SCDC_ERR_DET_CHECKSUM ; i++) + switch (num_lanes) { + case 3: + end_reg =3D SCDC_ERR_DET_CHECKSUM; + break; + case 4: + end_reg =3D SCDC_ERR_DET_3_H; + break; + default: + return -EINVAL; + } + + for (i =3D SCDC_ERR_DET_0_L; i <=3D end_reg; i++) sum =3D wrapping_add(u8, sum, scdc[i]); =20 if (sum) @@ -314,6 +374,12 @@ static int drm_scdc_parse_error_counters(const u8 scdc= [256], u16 counter[3]) counter[i] =3D 0; } =20 + if (num_lanes =3D=3D 4 && scdc[SCDC_ERR_DET_3_H] & SCDC_CHANNEL_VALID) + counter[3] =3D (scdc[SCDC_ERR_DET_3_H] & ~SCDC_CHANNEL_VALID) << 8 | + scdc[SCDC_ERR_DET_3_L]; + else + counter[3] =3D 0; + return 0; } =20 @@ -331,6 +397,7 @@ int drm_scdc_read_state(struct drm_connector *connector= , struct drm_scdc_state * struct i2c_adapter *ddc; struct drm_scdc *scdc; u8 *buf =3D state->scdc; + int num_lanes; int ret; =20 if (!state || !connector) @@ -356,11 +423,26 @@ int drm_scdc_read_state(struct drm_connector *connect= or, struct drm_scdc_state * =20 state->scrambling_detected =3D buf[SCDC_SCRAMBLER_STATUS] & SCDC_SCRAMBLI= NG_STATUS; =20 + state->rate =3D FIELD_GET(SCDC_FRL_RATE, buf[SCDC_CONFIG_1]); + num_lanes =3D drm_scdc_num_frl_lanes(state->rate); + if (num_lanes < 0) + return num_lanes; + if (!num_lanes) + num_lanes =3D 3; + + state->ffe_levels =3D FIELD_GET(SCDC_FFE_LEVELS, buf[SCDC_CONFIG_1]); + drm_scdc_parse_status0_flags(buf[SCDC_STATUS_FLAGS_0], &state->stf); - ret =3D drm_scdc_parse_error_counters(buf, state->error_count); + drm_scdc_parse_status1_2_flags(buf[SCDC_STATUS_FLAGS_1], + buf[SCDC_STATUS_FLAGS_2], &state->stf); + ret =3D drm_scdc_parse_error_counters(buf, state->error_count, num_lanes); if (ret) return ret; =20 + if (num_lanes =3D=3D 4 && (buf[SCDC_ERR_DET_RS_H] & SCDC_CHANNEL_VALID)) + state->rs_corrections =3D (buf[SCDC_ERR_DET_RS_H] & ~SCDC_CHANNEL_VALID)= << 8 | + buf[SCDC_ERR_DET_RS_L]; + return 0; } EXPORT_SYMBOL(drm_scdc_read_state); @@ -412,6 +494,8 @@ static int scdc_status_show(struct seq_file *m, void *d= ata) =20 scdc_print_flag(m, "Scrambling Enabled", st->scrambling_enabled); scdc_print_flag(m, "Scrambling Detected", st->scrambling_detected); + scdc_print_str(m, "FRL Rate", drm_scdc_frl_rate_str(st->rate)); + scdc_print_dec(m, "FFE Levels", st->ffe_levels); =20 if (st->tmds_bclk_x40) scdc_print_str(m, "TMDS Bit Clock Ratio", "1/40"); @@ -422,10 +506,19 @@ static int scdc_status_show(struct seq_file *m, void = *data) scdc_print_flag(m, "Channel 0 Locked", st->stf.ch0_locked); scdc_print_flag(m, "Channel 1 Locked", st->stf.ch1_locked); scdc_print_flag(m, "Channel 2 Locked", st->stf.ch2_locked); + if (drm_scdc_num_frl_lanes(st->rate) =3D=3D 4) + scdc_print_flag(m, "Lane 3 Locked", st->stf.ln3_locked); + + scdc_print_flag(m, "Sink Ready For Link Training", st->stf.flt_ready); + scdc_print_flag(m, "Sink Failed To Decode DSC", st->stf.dsc_fail); =20 scdc_print_dec(m, "Channel 0 Errors", st->error_count[0]); scdc_print_dec(m, "Channel 1 Errors", st->error_count[1]); scdc_print_dec(m, "Channel 2 Errors", st->error_count[2]); + if (drm_scdc_num_frl_lanes(st->rate) =3D=3D 4) { + scdc_print_dec(m, "Lane 3 Errors", st->error_count[3]); + scdc_print_dec(m, "Reed-Solomon Corrections", st->rs_corrections); + } =20 return 0; =20 diff --git a/include/drm/display/drm_scdc.h b/include/drm/display/drm_scdc.h index 3d58f37e8ed8..7f0b05b2f280 100644 --- a/include/drm/display/drm_scdc.h +++ b/include/drm/display/drm_scdc.h @@ -29,6 +29,8 @@ #define SCDC_SOURCE_VERSION 0x02 =20 #define SCDC_UPDATE_0 0x10 +#define SCDC_RSED_UPDATE (1 << 6) +#define SCDC_FLT_UPDATE (1 << 5) #define SCDC_READ_REQUEST_TEST (1 << 2) #define SCDC_CED_UPDATE (1 << 1) #define SCDC_STATUS_UPDATE (1 << 0) @@ -46,14 +48,25 @@ #define SCDC_CONFIG_0 0x30 #define SCDC_READ_REQUEST_ENABLE (1 << 0) =20 +#define SCDC_CONFIG_1 0x31 +#define SCDC_FRL_RATE 0x0f +#define SCDC_FFE_LEVELS 0xf0 + #define SCDC_STATUS_FLAGS_0 0x40 +#define SCDC_DSC_FAIL (1 << 7) +#define SCDC_FLT_READY (1 << 6) +#define SCDC_LN3_LOCK (1 << 4) #define SCDC_CH2_LOCK (1 << 3) #define SCDC_CH1_LOCK (1 << 2) #define SCDC_CH0_LOCK (1 << 1) -#define SCDC_CH_LOCK_MASK (SCDC_CH2_LOCK | SCDC_CH1_LOCK | SCDC_CH0_LOCK) +#define SCDC_CH_LOCK_MASK (SCDC_LN3_LOCK | SCDC_CH2_LOCK | SCDC_CH1_LOCK = | \ + SCDC_CH0_LOCK) #define SCDC_CLOCK_DETECT (1 << 0) =20 #define SCDC_STATUS_FLAGS_1 0x41 +#define SCDC_LN_EVEN_TRAIN_PTRN 0x0f +#define SCDC_LN_ODD_TRAIN_PTRN 0xf0 +#define SCDC_STATUS_FLAGS_2 0x42 =20 #define SCDC_ERR_DET_0_L 0x50 #define SCDC_ERR_DET_0_H 0x51 @@ -65,6 +78,12 @@ =20 #define SCDC_ERR_DET_CHECKSUM 0x56 =20 +#define SCDC_ERR_DET_3_L 0x57 +#define SCDC_ERR_DET_3_H 0x58 + +#define SCDC_ERR_DET_RS_L 0x59 +#define SCDC_ERR_DET_RS_H 0x5a + #define SCDC_TEST_CONFIG_0 0xc0 #define SCDC_TEST_READ_REQUEST (1 << 7) #define SCDC_TEST_READ_REQUEST_DELAY(x) ((x) & 0x7f) diff --git a/include/drm/display/drm_scdc_helper.h b/include/drm/display/dr= m_scdc_helper.h index e0b79d79e1ff..a3b20adaac7e 100644 --- a/include/drm/display/drm_scdc_helper.h +++ b/include/drm/display/drm_scdc_helper.h @@ -24,6 +24,7 @@ #ifndef DRM_SCDC_HELPER_H #define DRM_SCDC_HELPER_H =20 +#include #include =20 #include @@ -38,8 +39,65 @@ struct drm_scdc_status_flags { bool ch0_locked; bool ch1_locked; bool ch2_locked; + bool ln3_locked; + bool flt_ready; + bool dsc_fail; + + /* Status Register 1 */ + u8 ln0_training_pattern : 4; + u8 ln1_training_pattern : 4; + + /* Status Register 2 */ + u8 ln2_training_pattern : 4; + u8 ln3_training_pattern : 4; +}; + +enum drm_scdc_frl_rate { + SCDC_FRL_RATE_OFF =3D 0, + SCDC_FRL_RATE_3X3 =3D 1, + SCDC_FRL_RATE_6X3 =3D 2, + SCDC_FRL_RATE_6X4 =3D 3, + SCDC_FRL_RATE_8X4 =3D 4, + SCDC_FRL_RATE_10X4 =3D 5, + SCDC_FRL_RATE_12X4 =3D 6, + SCDC_FRL_RATE_RESV_7 =3D 7, + SCDC_FRL_RATE_RESV_8 =3D 8, + SCDC_FRL_RATE_RESV_9 =3D 9, + SCDC_FRL_RATE_RESV_10 =3D 10, + SCDC_FRL_RATE_RESV_11 =3D 11, + SCDC_FRL_RATE_RESV_12 =3D 12, + SCDC_FRL_RATE_RESV_13 =3D 13, + SCDC_FRL_RATE_RESV_14 =3D 14, + SCDC_FRL_RATE_RESV_15 =3D 15 }; =20 +/** + * drm_scdc_num_frl_lanes - get number of lanes for a given FRL rate + * @rate: one of &enum drm_scdc_frl_rate + * + * For a given @rate, return the number of lanes it uses. + * + * Returns: %-EINVAL if @rate is not a valid FRL rate, or the number of la= nes + * for a given &enum drm_scdc_frl_rate on success (including %0 for "off") + */ +static inline __pure int drm_scdc_num_frl_lanes(enum drm_scdc_frl_rate rat= e) +{ + switch (rate) { + case SCDC_FRL_RATE_OFF: + return 0; + case SCDC_FRL_RATE_3X3: + case SCDC_FRL_RATE_6X3: + return 3; + case SCDC_FRL_RATE_6X4: + case SCDC_FRL_RATE_8X4: + case SCDC_FRL_RATE_10X4: + case SCDC_FRL_RATE_12X4: + return 4; + default: + return -EINVAL; + } +} + struct drm_scdc_state { /** @stf: contents of the status flag registers */ struct drm_scdc_status_flags stf; @@ -52,9 +110,14 @@ struct drm_scdc_state { * clock period, false if it's 1/10th of the clock period. */ bool tmds_bclk_x40; - /** @error_count: character error counts for each channel */ - u16 error_count[3]; - + /** @rate: FRL rate set by the source */ + enum drm_scdc_frl_rate rate : 4; + /** @ffe_levels: The FFE levels for @rate set by the source */ + u8 ffe_levels : 4; + /** @error_count: character error counts for each channel/link */ + u16 error_count[4]; + /** @rs_corrections: number of Reed-Solomon Corrections */ + u16 rs_corrections; /** @scdc: raw SCDC data buffer */ u8 scdc[256]; }; --=20 2.54.0