All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mario Limonciello <superm1@kernel.org>
To: Harry Wentland <harry.wentland@amd.com>,
	Leo Li <sunpeng.li@amd.com>,
	 Alex Deucher <alexander.deucher@amd.com>
Cc: "Richard Hughes" <richard@hughsie.com>,
	amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
	"Wayne Lin" <Wayne.Lin@amd.com>,
	simonit.orig@gmail.com, "Eren Özen" <erenozen@protonmail.com>,
	"Mario Limonciello" <superm1@kernel.org>
Subject: [PATCH v4] drm/amd/display: Route connector DDC over AUX for native DP sinks
Date: Wed, 18 Nov 2026 23:17:14 -0600	[thread overview]
Message-ID: <20261118-superm1-amdgpu-ddc-v4-1-539eaeb4edd7@kernel.org> (raw)

On DisplayPort and eDP connectors DDC is tunneled over the AUX channel,
but the connector's "ddc" adapter ("AMDGPU DM i2c hw bus N") always
drives the physical i2c pins, which don't reach a native DP sink.  The
AUX backed adapter ("AMDGPU DM aux hw bus N") does, so userspace such as
fwupd, which uses the "ddc" sysfs link for DDC/CI, has to work around
this.

Keep a single i2c bus per connector and pick the transport per transfer
based on the link's transaction mode (link->aux_mode), as the EDID read
helpers already do: for native DP/eDP/MST sinks forward the transfer to
the AUX adapter, otherwise (DVI/HDMI, including DP++ with a passive
adapter) use the hw i2c engine as before.

Reviewed-by: Wayne Lin <Wayne.Lin@amd.com>
Reported-by: simonit.orig@gmail.com
Closes: https://github.com/fwupd/fwupd/pull/11308
Co-developed-by: "Eren Özen" <erenozen@protonmail.com>
Signed-off-by: "Eren Özen" <erenozen@protonmail.com>
Signed-off-by: Mario Limonciello <superm1@kernel.org>
---
Changes in v4:
- Add Wayne's tag
- Fold in Eren's fix for kunit tests
- Link to v3: https://patch.msgid.link/20261110-superm1-amdgpu-ddc-v3-1-9436b04d1e31@kernel.org

Changes in v3:
- Select the transport with link->aux_mode instead of
  link->local_sink->sink_signal, matching the EDID read helpers in
  amdgpu_dm_helpers.c.  This drops the unlocked local_sink dereference
  that could race with link detection/hotplug (use-after-free), and it
  also covers MST links (local_sink is NULL there) and links with
  force_to_use_aux set.
- Check ddc_service->link for NULL before dereferencing it, so
  amdgpu_dm_i2c_xfer() still returns -EIO when there is no ddc_pin
  (fixes dm_test_i2c_xfer_no_ddc_pin()).
- Reword the commit message to describe the aux_mode selection.
- Link to v2: https://patch.msgid.link/20261103-superm1-amdgpu-ddc-v2-1-7bde6d004382@kernel.org

Changes in v2:
- Check which i2c bus to use on the fly instead of changing static symlink to
  avoid regressing passive adapters.
- Link to v1: https://patch.msgid.link/20261102-superm1-amdgpu-ddc-v1-1-9c5cb4a4f62d@amd.com
---
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c  | 16 ++++++++++++++++
 .../display/amdgpu_dm/tests/amdgpu_dm_connector_test.c   |  6 +++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
index b498fc5fbb140..f80de9e7f850c 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
@@ -3373,6 +3373,22 @@ STATIC_IFN_KUNIT int amdgpu_dm_i2c_xfer(struct i2c_adapter *i2c_adap,
 	int i;
 	int result = -EIO;
 
+	if (!i2c->oem && ddc_service->link) {
+		struct dc_link *link = ddc_service->link;
+		struct amdgpu_dm_connector *aconnector = link->priv;
+
+		/*
+		 * DDC to a native DisplayPort sink (SST, MST or eDP) is
+		 * tunneled over the AUX channel; the physical i2c pins only
+		 * reach DVI/HDMI sinks (e.g. DP++ with a passive adapter).
+		 * Use the same aux_mode selection as the EDID read helpers so
+		 * the connector's single "ddc" bus works for either sink.
+		 */
+		if (aconnector && link->aux_mode &&
+		    aconnector->dm_dp_aux.aux.ddc.algo)
+			return i2c_transfer(&aconnector->dm_dp_aux.aux.ddc, msgs, num);
+	}
+
 	if (!ddc_service->ddc_pin)
 		return result;
 
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c
index f09e2a72c5346..6564d5d22825c 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c
@@ -6140,7 +6140,9 @@ static void dm_test_i2c_func_returns_flags(struct kunit *test)
  * @test: The KUnit test context
  *
  * When the backing ddc_service has no ddc_pin the transfer bails out early
- * with -EIO before touching the message buffers or the dc handle.
+ * with -EIO before touching the message buffers or the dc handle. Non-OEM
+ * adapters always have a link, so the test gives the ddc_service a zeroed
+ * one.
  */
 static void dm_test_i2c_xfer_no_ddc_pin(struct kunit *test)
 {
@@ -6151,6 +6153,8 @@ static void dm_test_i2c_xfer_no_ddc_pin(struct kunit *test)
 	KUNIT_ASSERT_NOT_NULL(test, i2c);
 	ddc = kunit_kzalloc(test, sizeof(*ddc), GFP_KERNEL);
 	KUNIT_ASSERT_NOT_NULL(test, ddc);
+	ddc->link = kunit_kzalloc(test, sizeof(*ddc->link), GFP_KERNEL);
+	KUNIT_ASSERT_NOT_NULL(test, ddc->link);
 
 	i2c->ddc_service = ddc;
 	i2c_set_adapdata(&i2c->base, i2c);

---
base-commit: 7475ea8b58616b33c04afb976cf0fbaad9dd63fb
change-id: 20261102-superm1-amdgpu-ddc-63f0eb10c022

Best regards,
--  
Mario Limonciello <superm1@kernel.org>


             reply	other threads:[~2026-11-19  5:17 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-19  5:17 Mario Limonciello [this message]
2026-11-19  5:35 ` [PATCH v4] drm/amd/display: Route connector DDC over AUX for native DP sinks sashiko-bot
2026-11-19  8:36 ` Eren Özen
2026-11-19 11:23   ` Mario Limonciello

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=20261118-superm1-amdgpu-ddc-v4-1-539eaeb4edd7@kernel.org \
    --to=superm1@kernel.org \
    --cc=Wayne.Lin@amd.com \
    --cc=alexander.deucher@amd.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=erenozen@protonmail.com \
    --cc=harry.wentland@amd.com \
    --cc=richard@hughsie.com \
    --cc=simonit.orig@gmail.com \
    --cc=sunpeng.li@amd.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.