Received-SPF: pass (google.com: domain of linux-kernel+bounces-94852-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Thu, 7 Mar 2024 13:10:27 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@redhat.com>, Daniel Vetter
 <daniel.vetter@ffwll.ch>, Jani Nikula <jani.nikula@linux.intel.com>, Joonas
 Lahtinen <joonas.lahtinen@linux.intel.com>, Rodrigo Vivi
 <rodrigo.vivi@intel.com>
Cc: Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI
 <dri-devel@lists.freedesktop.org>, Animesh Manna <animesh.manna@intel.com>,
 Imre Deak <imre.deak@intel.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes
 tree
Message-ID: <20240307131027.66be2266@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/gBe8YFdyBRsQQ7vG967EwEz";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/gBe8YFdyBRsQQ7vG967EwEz
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/gpu/drm/i915/display/intel_dp.c

between commit:

  984318aaf7b6 ("drm/i915/panelreplay: Move out psr_init_dpcd() from init_c=
onnector()")

from the drm-intel-fixes tree and commit:

  e60cff453b82 ("drm/i915/dp: Enable DP tunnel BW allocation mode")

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.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/display/intel_dp.c
index 94d2a15d8444,6ece2c563c7a..000000000000
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@@ -5699,9 -5702,13 +5702,16 @@@ intel_dp_detect(struct drm_connector *c
  		goto out;
  	}
 =20
+ 	ret =3D intel_dp_tunnel_detect(intel_dp, ctx);
+ 	if (ret =3D=3D -EDEADLK)
+ 		return ret;
+=20
+ 	if (ret =3D=3D 1)
+ 		intel_connector->base.epoch_counter++;
+=20
 +	if (!intel_dp_is_edp(intel_dp))
 +		intel_psr_init_dpcd(intel_dp);
 +
  	intel_dp_detect_dsc_caps(intel_dp, intel_connector);
 =20
  	intel_dp_configure_mst(intel_dp);

--Sig_/gBe8YFdyBRsQQ7vG967EwEz
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXpIhMACgkQAVBC80lX
0GxBvQf7BmI0o7dg07Jqo6rgMQ9Ay2p8WMp/6yyo8Jwhyb5JmFYD87E2QNv9HHfT
HgoVX1Mb+jk665Q/obBnEcW1Hcp/sZuli4SU0FVufMV0DGCz/va+z8k2DhRTxgvq
oDwInGOeOksje6o31zYGtvcbkZ4CA9/GAaOIN+h/U+eNqALRgMS5p6GAMfZUCOl/
XipVMUDj8oqzgkeKY5rSop1lj0hF+Oi4NJSP4Z4W00+M/zB3QbyT4WzYRbLcloWH
UWBFoyOUzo/ShztOMcR/cBOIDSiwWc/VQum4259wUwPJvIXqaipIXhTrNMgBMTx3
m2UTeFGeAXW8d7sKGANRay06i4PH+Q==
=14RR
-----END PGP SIGNATURE-----

--Sig_/gBe8YFdyBRsQQ7vG967EwEz--