From nobody Mon Jun 8 08:36:17 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 09169395DB8 for ; Thu, 4 Jun 2026 15:53:26 +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=1780588407; cv=pass; b=trevmGnyYEhZoYe30m2jF7N/lPmQTOEePRz9jYs/9PnL6DDzYws+15/lXnSJJwvr3Pvcyix3EAoYWx92oG81OsDJxRXG9lKnIBE6jNRbioVB6JnWstuk/v8ENeEsRC02lGnQayaFxQoTwR/LiQQbOmKuQGFpNiWeU7Jz19/iEcc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780588407; c=relaxed/simple; bh=frx63+jfDmBBYBOCBHRfOBl3WKpJN8AMRg0pfp9oT4k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WYvTVEgnxOkzhk1U4xMbCdwrp8tw5aVueRLGdtEzHHCJhYFsL4gBad/VfWqxrxSfRbakFHtOk0+2KTlhxWtWwzoK2vLU/WkmikDjS7zoJWEHiPsNm6DnDOAMUJ9JQcoLJKFD0rE0T4I3kksSluSVs0+vt9BAR8Ru6WmUiRjTawM= 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=LO9z9DAx; 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="LO9z9DAx" ARC-Seal: i=1; a=rsa-sha256; t=1780588371; cv=none; d=zohomail.com; s=zohoarc; b=VZMgjt2srOQceLgeh37u1UJi1mBA2mMKnsUFLCxg28T4auyZWoHiSF3THLCPLGgr+JwrTuAdRTdH+UF7cyeVRTHMXruUkHSdW/y6AR/T+2OIhIjBfjr+k0HHNHpxW5u64rJ4QlJmRkFdQ7LOcU/+VSX4n2ip1E98GeRrhzc/hLE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780588371; 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=nsYLndfHuOs0JObsN5t1SxqnqSjHNM8BeMSoMvyiaHaRe5xm2afKODieV+UPX+aJN5mPzzXgO0dw7obShoiYEP+NkC4jUll53thVU6Iu0dJKTfecjiH+ogvofAuJVuMtXWsCIICNRtKFWN/4fNZxqyeSKQKkvVWNxyYvJ0Ve3/E= 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=1780588371; 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=LO9z9DAxGQU8ihIGdPCq2AvZLrhYt2QwnNize4kDhlspUtqHrTFrBWgLDmTKpL8Z AqrRHkEOesTeGTsAKqW9eQ+nSK5DUmhQu3ikwKJZuTyXMjK9GJ+vM4Yef6t0lhSOSEx eNh+W1rriGOqUe8MWXZW/tmNQO/2qNtZyQaaH8N0= Received: by mx.zohomail.com with SMTPS id 1780588368794138.8570408477825; Thu, 4 Jun 2026 08:52:48 -0700 (PDT) From: Nicolas Frattaroli Date: Thu, 04 Jun 2026 17:52:06 +0200 Subject: [PATCH v5 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: <20260604-scdc-link-health-v5-1-11173b0ac3de@collabora.com> References: <20260604-scdc-link-health-v5-0-11173b0ac3de@collabora.com> In-Reply-To: <20260604-scdc-link-health-v5-0-11173b0ac3de@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 Mon Jun 8 08:36:17 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 DBEC43358B9 for ; Thu, 4 Jun 2026 15:53:25 +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=1780588407; cv=pass; b=NanCwduZ37TjhvvgBHu7YhXb0ZDLF4QHa3e9h+8r7h7fI0v+THHKZoRrO3YpBZ1TUwg9jO4BlR4y0i68NK5Bvdg/Sl/r0/iEx9c8iQZt4A18gCdddqkHm4Bs8zBiIGicH8Tu2z4GR0TrpJ06R/1g+2YUQshzBFacfdfn45zh9/U= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780588407; c=relaxed/simple; bh=yJiITTUCVfsLbnU4445DPUzWVBrMEumHtYZ0ncHqMv4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qQiKkuQsKQCXZYZsPJMpf67m1GBAI/Mlyvbi5lHpm/zNqKBSugtr6nbtBfwS5l+g8xJycGXfIzzGv8AQvqJp94nDQGTcp/lk0jBcaiBk6Igx6WwphAHwKnpAW6J3d63rJmA5CcM0dp8GURbCYM7prBgMK+qAZW/T3efLlzJYTFk= 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=Zz+51hJE; 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="Zz+51hJE" ARC-Seal: i=1; a=rsa-sha256; t=1780588375; cv=none; d=zohomail.com; s=zohoarc; b=M3ba7w9lZG5Lp3PMXV6bWYgRZLOrCiBjs+IFRcEeubw4L8OvH4zjnyeEVkCDu/+Q801rkps7U/uG2JCSPzbN/3V9N1lmwS50YpIknqejJiSVA1oBV1FgumQSikdebm3IEeGuSUTCcNu+b8QEP5lInMRpPI3T8ijy2xWTQqRIRbg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780588375; 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=Rx3TuQpIVNmnd5SE/lxpQIsGoPwzpXMxa/90uRihsZw=; b=Ys2p/20Cdim8XD6Jz1jgVrzRw0Jk2j5xSkVg6hQLheb8m57ovQUc6MF9/chpL5plRVofBtpHnaWMzReasXccrjmoeHOqW/mJDOPR90Lxq4tu6w7+Y1BEzSdJtfGlnc32B5LFZRhyvVOSmUGrM0fHCZKsIO69mq8G5pLHx7YRWu4= 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=1780588375; 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=Rx3TuQpIVNmnd5SE/lxpQIsGoPwzpXMxa/90uRihsZw=; b=Zz+51hJERKCuQISIdBHb2P2Ywbj+DkbYavkBuog0FNyzNmuo3yP9BPdZd6p32oZR MYJVxVib/O+3OjmCVXNbL6tDpLdq7mrUIn21BnvuZZiNIt16XnwzpeDVu0Ft+c4q4/g 9YQfQAFCizOt/JA0YdGAMwuUztFChaRMrhsJCG+4= Received: by mx.zohomail.com with SMTPS id 1780588373502233.6589804424251; Thu, 4 Jun 2026 08:52:53 -0700 (PDT) From: Nicolas Frattaroli Date: Thu, 04 Jun 2026 17:52:07 +0200 Subject: [PATCH v5 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: <20260604-scdc-link-health-v5-2-11173b0ac3de@collabora.com> References: <20260604-scdc-link-health-v5-0-11173b0ac3de@collabora.com> In-Reply-To: <20260604-scdc-link-health-v5-0-11173b0ac3de@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..d98bcb8ce748 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, 127, &buf[127], 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 Mon Jun 8 08:36:17 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 E48F030C618 for ; Thu, 4 Jun 2026 15:53:24 +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=1780588406; cv=pass; b=uT6CsUhH27+0DVQo4Os8EHeqKGMHgANiLupR6jCCTcYyfAt7WjcYvc+8Y6IgwUnbrsd9A98iNvFL9+k01uoyLr8rJjcweJql5cp1Ud8gzJdids46qwd1ZNX7ReKE/A0p3uH+rqV53ig8crPQmFNdsQYxAEEaDgLE5BGs89IJ0gg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780588406; c=relaxed/simple; bh=TWIYC97tRP/GyWP9zTTX+sGR0cOQqId9LBG7DkF5bWA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OZRTOHdk42Vn0V9MxFd02+d9qIqP1R60ZGoD5PIZ37fLK02GCsyrWlI/EQwFEtvPbA4KjzBy4dj9JgcsrJB5pIDHZLDdqIKTVKJDpJfJHzgyTGE11YN4ZUS2mkNTjjNc7SuPF4b4j5F5GO84zQZ+eKbO0l4c0JjDjpawQh3W/nE= 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=kOVAhBUE; 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="kOVAhBUE" ARC-Seal: i=1; a=rsa-sha256; t=1780588379; cv=none; d=zohomail.com; s=zohoarc; b=Yd/4n9CFrnTr6I7IyXO+nUo/uEeZ3HDKMgCaftd5Sc4IXNlQ0y+ij0pg+tmjv6h9SP8cBHuiaBQHtoxaYX4rp74Mkl3gVDridwNsOOgAEXdtb7Xkt8oKFn5IXKPEC0ERwJZ3W1YrYrfNbA8ruqdMJi7NLSl9XodbrdmC/Yod9/E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780588379; 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=SBHNcSoWmsxzmiAjCT9Ifr9ghvI4aXszbSJO+T3WQLc=; b=AbG51N3fp3wu4olaSHjXqp4a7uqQRjQHEci3qU8jH6XgjFjLdSvvnkmtEw1+JRpqz7WT04dZ8uynw9pep7pTLNwIHzOObKzoM7+g0FjmR537Ze6zheDy6zqodM1J048IWIajBLa4/MjqJMwEZRGyssexXWLAJJdO6QRCq7JsuEM= 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=1780588379; 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=SBHNcSoWmsxzmiAjCT9Ifr9ghvI4aXszbSJO+T3WQLc=; b=kOVAhBUE2R4qtJmhAy2WnEJLsmISJYp4+rfDiGhlP5/rNWCJAnEpY93iD9zbHfZ4 XjvqIQtYA0Gc8905IW4gWcFnJrnH6+kdgutQA2qSSxvdv0jNY1yoXSsm34L/u9YXF4E Yrtx7MWFO2eGVTJnrfW5wpVPmEqloGuMYohDwnRw= Received: by mx.zohomail.com with SMTPS id 1780588378412626.0244907177274; Thu, 4 Jun 2026 08:52:58 -0700 (PDT) From: Nicolas Frattaroli Date: Thu, 04 Jun 2026 17:52:08 +0200 Subject: [PATCH v5 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: <20260604-scdc-link-health-v5-3-11173b0ac3de@collabora.com> References: <20260604-scdc-link-health-v5-0-11173b0ac3de@collabora.com> In-Reply-To: <20260604-scdc-link-health-v5-0-11173b0ac3de@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 cafa498c3848..629d9b8aff22 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 Mon Jun 8 08:36:17 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 D5E3F3A873E for ; Thu, 4 Jun 2026 15:53:30 +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=1780588412; cv=pass; b=PKJriMuzKB/QXhj+ZyAscusDq1jNi5O49bs2yNSkFrVeKe76bUV0DnBlxljzo0VTEjcd6jskpuOO8mn4JiHsMI2qEs4C8/HvvkIOLkyNnnreJ1Lb1e5MLfkJk0+K5AWdF3myotWt5JfVrgyhUaVy1fyicWYbjYhZBRkFv56qpZI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780588412; c=relaxed/simple; bh=BxZlvtN8HiLh8RhvZodiCBRrh711xvcxma5RgsoGvj4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fJUpdMQEF+gh1gsETRvc13ofxASo8lpWYJ0Bw33xBK1VC3rAAmqT6zFnG8gXM7ZVGSgbkcrxlCQfwbif5i3oXUOs/9vDIeJp4rL1TwE+LIoCOkT1/g8LH5iPtuoGwyAuI1Y8I0irMTsfi7OutvgsdVJcFTEG9T7PVTJ2zjJotQc= 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=BE4L37Q4; 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="BE4L37Q4" ARC-Seal: i=1; a=rsa-sha256; t=1780588385; cv=none; d=zohomail.com; s=zohoarc; b=GKzEyrt77WBGEbGjfbjNVcJN7MAbXUmSQ7iBQiGfmBYR5aAnLMu6JINpqTlHJBY/t92tYjSCejffcXAwapDXHYCh/Rb3g8HRklN6UMk+iCL/CUF3fQKRmp5K2+zfXEfKwM3F+Q5rihudYMbN8eRYQBsiFx3e29ccjWaFJcJ0uLg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780588385; 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=g8uKVKlfHqDdwINXEkk7qFAJp7fTtp6aKcYMTaPhGAQ=; b=Kc++mGc61dgku+OERagFa1GsBlsq/++4GXK0s44V+zw0nH0DhSfRqIz/1Yqb3Y/C7U7XQQNatg1YpGqD615c/rsCU5dkZ9m3+6R85a6agbneqfdsh4Za+Veurs5aLLHilLpPZCMhSawBGNaI29CPu7K2WyfWRPaXFqsXtv0c8Ak= 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=1780588385; 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=g8uKVKlfHqDdwINXEkk7qFAJp7fTtp6aKcYMTaPhGAQ=; b=BE4L37Q41K/hWazpMonMB2hnZDimm95GGWfKvKogy9p57HalWYYEJMq17cfBlhWy O+n542ek5+UP4ZgOCcchUpoZpJcPLSUaJd5BVMVfjLms0i1zXY3bN32peuvtG6mIOKu wjbAgWgCUBWPO68e5xBwzgAKM9Zl/1bIbcNJJREE= Received: by mx.zohomail.com with SMTPS id 1780588383136477.04198294027947; Thu, 4 Jun 2026 08:53:03 -0700 (PDT) From: Nicolas Frattaroli Date: Thu, 04 Jun 2026 17:52:09 +0200 Subject: [PATCH v5 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: <20260604-scdc-link-health-v5-4-11173b0ac3de@collabora.com> References: <20260604-scdc-link-health-v5-0-11173b0ac3de@collabora.com> In-Reply-To: <20260604-scdc-link-health-v5-0-11173b0ac3de@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 d98bcb8ce748..42c24da8abcc 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