Thank you for your contribution! Sashiko AI review found 1 potential issue to consider: - [High] drm/amd/display: stale link->aux_mode in amdgpu_dm_i2c_xfer() breaks DP++ --
commit bd7217b6334d8e26e4a44e7561c8afe2462a790d Author: Mario Limonciello <[email protected]> drm/amd/display: Route connector DDC over AUX for native DP sinks This commit routes transfers on a connector's DDC i2c adapter through the AUX DDC adapter when link->aux_mode is set so that native DisplayPort, eDP, and MST sinks can be reached via the connector's ddc bus. > 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); > + } [Severity: High] As reported by Eren Özen on v2 [1], can a stale link->aux_mode misroute the passive DP++ dongle identification read over AUX when a native DisplayPort sink is unplugged and replaced with a passive DP-to-HDMI adapter on the same port? link->aux_mode is not cleared on disconnect, and detect_link_and_local_sink() only updates it after detect_dp() returns: drivers/gpu/drm/amd/display/dc/link/link_detection.c:detect_link_and_local_sink() { ... if (!detect_dp(link, &sink_caps, reason)) { ... set_ddc_transaction_type(link->ddc, sink_caps.transaction_type); link->aux_mode = link_is_in_aux_transaction_mode(link->ddc); ... } During detect_dp(), dp_passive_dongle_detection() -> query_dp_dual_mode_adaptor() reads DP_HDMI_DONGLE_ADDRESS (0x40) via i2c_read() -> dm_helpers_submit_i2c() -> i2c_transfer(&aconnector->i2c->base) -> amdgpu_dm_i2c_xfer() while link->aux_mode is still true from the previous native DP sink. Forwarding that read to I2C-over-AUX fails on a passive DP++ adapter, causing query_dp_dual_mode_adaptor() to fall back to DISPLAY_DONGLE_DP_DVI_DONGLE (SIGNAL_TYPE_DVI_SINGLE_LINK), which caps the pixel clock to 165 MHz and disables HDMI audio and infoframes. [1] https://lore.kernel.org/r/QU464501lRPW3X8es-jXBFOvvwqS3eKR3HRS33U6x6o5eYC6h5AKV7f3ZXRCaU7-sEcupJMHereqyDUsUSG_fsOMNwvGO_CcZRKsz1AgObk=@protonmail.com -- Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
