Received-SPF: pass (google.com: domain of linux-kernel+bounces-19022-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Mon, 8 Jan 2024 11:14:51 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@redhat.com>, DRI <dri-devel@lists.freedesktop.org>
Cc: Alex Deucher <alexander.deucher@amd.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>, Wade Wang <wade.wang@hp.com>, Wayne Lin
 <wayne.lin@amd.com>
Subject: linux-next: manual merge of the drm tree with Linus' tree
Message-ID: <20240108111451.67c34a93@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/d75n8xzFTcdrovT1=A9bA_h";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/d75n8xzFTcdrovT1=A9bA_h
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/amd/display/amdgpu_dm/amdgpu_dm.c

between commit:

  9cdef4f72037 ("drm/amd/display: pbn_div need be updated for hotplug event=
")

from Linus' tree and commit:

  191dc43935d1 ("drm/dp_mst: Store the MST PBN divider value in fixed point=
 format")

from the drm tree.

I fixed it up (I think, 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/amd/display/amdgpu_dm/amdgpu_dm.c
index 73dd4bc870dc,54861136dafd..000000000000
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@@ -6916,7 -7007,8 +7009,7 @@@ static int dm_encoder_helper_atomic_che
  	if (IS_ERR(mst_state))
  		return PTR_ERR(mst_state);
 =20
- 	mst_state->pbn_div =3D dm_mst_get_pbn_divider(aconnector->mst_root->dc_l=
ink);
 -	if (!mst_state->pbn_div.full)
 -		mst_state->pbn_div.full =3D dfixed_const(dm_mst_get_pbn_divider(aconnec=
tor->mst_root->dc_link));
++	mst_state->pbn_div.full =3D dfixed_const(dm_mst_get_pbn_divider(aconnect=
or->mst_root->dc_link));
 =20
  	if (!state->duplicated) {
  		int max_bpc =3D conn_state->max_requested_bpc;

--Sig_/d75n8xzFTcdrovT1=A9bA_h
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWbPnsACgkQAVBC80lX
0GyFVgf8DNuxxfYi5lerGxqQLb82OBymXJLZcvRwzmabkrIqRBrtIkkxVg+mz09z
s2+FF+0V87HFR3iO0E71WZr2oHZ/1nhQQNT6H5BKp7AcVj3n/xHcSkUlzvp8MfCs
mthwSP+dobQJMgr9Co9dwHnA+gCXh8vAMXZ+A/5pH3kj6J5AGJmDRmZXrn6SVLK8
dLRFykwOrE3DkaDtN11pRdVOhrl7+YvPc1+y/nzRQok+aWwwmxmNG1wCEX6Bp22p
zxP/tft4zJaJw+CAD/hQQk//GDcEuMKAuixCMp376V1agqYHPmnOBhQgFJ0K+Cpc
5u/A/WEXlwokNx0Nrfa9mX1bxR+rfg==
=F69V
-----END PGP SIGNATURE-----

--Sig_/d75n8xzFTcdrovT1=A9bA_h--