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.
Reported-by: [email protected]
Closes: https://github.com/fwupd/fwupd/pull/11308
Signed-off-by: Mario Limonciello <[email protected]>
---
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/[email protected]
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/[email protected]
---
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
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;
---
base-commit: 7475ea8b58616b33c04afb976cf0fbaad9dd63fb
change-id: 20261102-superm1-amdgpu-ddc-63f0eb10c022
Best regards,
--
Mario Limonciello <[email protected]>