Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 16 Jul 2025 14:18:32 +1000

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/display/drm_dp_helper.c

between commit:

  d34d6feaf4a7 ("drm/dp: Change AUX DPCD probe address from LANE0_1_STATUS to TRAINING_PATTERN_SET")

from the drm-intel-fixes tree and commit:

  b87ed522b364 ("drm/dp: Add an EDID quirk for the DPCD register access probe")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/display/drm_dp_helper.c
index ea78c6c8ca7a,1c3920297906..000000000000
--- a/drivers/gpu/drm/display/drm_dp_helper.c
+++ b/drivers/gpu/drm/display/drm_dp_helper.c
@@@ -712,20 -741,8 +741,8 @@@ ssize_t drm_dp_dpcd_read(struct drm_dp_
  {
  	int ret;
  
- 	/*
- 	 * HP ZR24w corrupts the first DPCD access after entering power save
- 	 * mode. Eg. on a read, the entire buffer will be filled with the same
- 	 * byte. Do a throw away read to avoid corrupting anything we care
- 	 * about. Afterwards things will work correctly until the monitor
- 	 * gets woken up and subsequently re-enters power save mode.
- 	 *
- 	 * The user pressing any button on the monitor is enough to wake it
- 	 * up, so there is no particularly good place to do the workaround.
- 	 * We just have to do it before any DPCD access and hope that the
- 	 * monitor doesn't power down exactly after the throw away read.
- 	 */
- 	if (!aux->is_remote) {
+ 	if (dpcd_access_needs_probe(aux)) {
 -		ret = drm_dp_dpcd_probe(aux, DP_LANE0_1_STATUS);
 +		ret = drm_dp_dpcd_probe(aux, DP_TRAINING_PATTERN_SET);
  		if (ret < 0)
  			return ret;
  	}