Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
Date:   Tue, 7 Nov 2023 10:49:17 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Dave Airlie <airlied@redhat.com>
Cc:     Alex Deucher <alexdeucher@gmail.com>,
        Alex Deucher <alexander.deucher@amd.com>,
        Bjorn Helgaas <bhelgaas@google.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Sui Jingfeng <suijingfeng@loongson.cn>,
        DRI <dri-devel@lists.freedesktop.org>
Subject: Re: linux-next: manual merge of the amdgpu tree with Linus' tree
Message-ID: <20231107104917.09180c14@canb.auug.org.au>
In-Reply-To: <20231106094855.38376d52@canb.auug.org.au>
References: <20231106094855.38376d52@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/1G+SLmpH=k.wj.RskGDCp/c";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/1G+SLmpH=k.wj.RskGDCp/c
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 6 Nov 2023 09:48:55 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>=20
> Today's linux-next merge of the amdgpu tree got a conflict in:
>=20
>   drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
>=20
> between commit:
>=20
>   18bf400530ca ("drm/amdgpu: Use pci_get_base_class() to reduce duplicate=
d code")
>=20
> from Linus' tree and commit:
>=20
>   432e664e7c98 ("drm/amdgpu: don't use ATRM for external devices")
>=20
> from the amdgpu tree.
>=20
> 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
> --=20
> Cheers,
> Stephen Rothwell
>=20
> diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
> index 5bbb23e102ba,f3a09ecb7699..000000000000
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
> @@@ -286,12 -287,12 +287,16 @@@ static bool amdgpu_atrm_get_bios(struc
>   	/* ATRM is for the discrete card only */
>   	if (adev->flags & AMD_IS_APU)
>   		return false;
> +=20
> + 	/* ATRM is for on-platform devices only */
> + 	if (dev_is_removable(&adev->pdev->dev))
> + 		return false;
>  =20
>  -	while ((pdev =3D pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) !=3D=
 NULL) {
>  +	while ((pdev =3D pci_get_base_class(PCI_BASE_CLASS_DISPLAY, pdev))) {
>  +		if ((pdev->class !=3D PCI_CLASS_DISPLAY_VGA << 8) &&
>  +		    (pdev->class !=3D PCI_CLASS_DISPLAY_OTHER << 8))
>  +			continue;
>  +
>   		dhandle =3D ACPI_HANDLE(&pdev->dev);
>   		if (!dhandle)
>   			continue;

This is now a conflict between the drm tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/1G+SLmpH=k.wj.RskGDCp/c
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVJe30ACgkQAVBC80lX
0Gz0/Qf9HdnhwPZJVImw9UpPkqdiuBu7It6p1hHeGHWR/SLvSiDQAr4Rm4+JrzJ9
kjqHdpR2UTjfpr79YSbXYNbllHswM5p+tJObOgTHN9+N4hJfP+EQJj16F3fV5kAN
F7hC7E+FWKkFb6FOJjwvH3RAY/uJkNOV1gKDFSeF+EiJsvdJZfk8GonlzzADrguS
bOdK791c4y4fKNp7BGmmtuicru8+xkPPCOHc0EW0STIfGEfUvLYyhGZy0i2KQ57g
u9nsHOd/1tBuPghQTRjkvM9Fh0hxCwQOJt/vAEGK6zhPam1ZrynfNg/Kx/ebC8ep
js6X/j44GcnHrdC7Yxvvw1zGv+wlAQ==
=ixwX
-----END PGP SIGNATURE-----

--Sig_/1G+SLmpH=k.wj.RskGDCp/c--