Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
Date:   Wed, 22 Nov 2023 12:10:54 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     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>,
        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>,
        Wayne Lin <Wayne.Lin@amd.com>
Subject: Re: linux-next: manual merge of the drm-intel tree with Linus' tree
Message-ID: <20231122121054.0d660cd8@canb.auug.org.au>
In-Reply-To: <20231122115137.04a33a6c@canb.auug.org.au>
References: <20231122115137.04a33a6c@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/fcudTv.a=RMzgcutdNML3A_";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/fcudTv.a=RMzgcutdNML3A_
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Wed, 22 Nov 2023 11:51:37 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the drm-intel tree got a conflict in:
>=20
>   drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
>=20
> between commit:
>=20
>   9031e0013f81 ("drm/amd/display: Fix mst hub unplug warning")
>=20
> from Linus' tree and commit:
>=20
>   191dc43935d1 ("drm/dp_mst: Store the MST PBN divider value in fixed poi=
nt format")
>=20
> from the drm-intel tree.
>=20
> I fixed it up (I just used the former) 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.

Actually, the resolution I used is below.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
index c7a29bb737e2,53e323b71d26..000000000000
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
@@@ -209,11 -210,11 +210,11 @@@ static void dm_helpers_construct_old_pa
  			struct drm_dp_mst_atomic_payload *new_payload,
  			struct drm_dp_mst_atomic_payload *old_payload)
  {
 -	struct link_mst_stream_allocation_table current_link_table =3D
 -									link->mst_stream_alloc_table;
 -	struct link_mst_stream_allocation *dc_alloc;
 -	int pbn_per_slot =3D dfixed_trunc(pbn_per_slot_fp);
 -	int i;
 +	struct drm_dp_mst_atomic_payload *pos;
- 	int pbn_per_slot =3D mst_state->pbn_div;
++	int pbn_per_slot =3D dfixed_trunc(mst_state->pbn_div);
 +	u8 next_payload_vc_start =3D mgr->next_start_slot;
 +	u8 payload_vc_start =3D new_payload->vc_start_slot;
 +	u8 allocated_time_slots;
 =20
  	*old_payload =3D *new_payload;
 =20

--Sig_/fcudTv.a=RMzgcutdNML3A_
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVdVR4ACgkQAVBC80lX
0GzuPQf/VOh8+IwdxziZyUsjKcm3yIhPPVmxgtSCWsgGOC00PCVaC4L3J6ktverQ
MSCFmxOpp0rOcTTH9EYl1J3K31SHvs2q605cIFb98W16+kaSy7lHAgBKWk/rVG93
DgOJDlzDjQWVB94eMSkt6aVY+ydyv5K3+klmzldYfNPcP1ouZ40qrB52Ji/vyQZ3
QwbGQ945WfedLtnbjR3uppBmNAljSYfvSvFmPpAaKSRIbLhRXOFo/354E31jSkOH
q3sp43BhpMhKeTZ5W7zZCzxtvrVv3/wF1uGMV2fxF4eapIfvL4mlS5Z+rTNAq/3c
gUPVx6g1mJI0WiQBVbDLgqQkeKBsfA==
=SMFA
-----END PGP SIGNATURE-----

--Sig_/fcudTv.a=RMzgcutdNML3A_--