Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5;
Date:   Mon, 6 Nov 2023 09:48:55 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Alex Deucher <alexdeucher@gmail.com>
Cc:     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>
Subject: linux-next: manual merge of the amdgpu tree with Linus' tree
Message-ID: <20231106094855.38376d52@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/URENiMlDcB9LImW7A4CTEOx";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c

between commit:

  18bf400530ca ("drm/amdgpu: Use pci_get_base_class() to reduce duplicated =
code")

from Linus' tree and commit:

  432e664e7c98 ("drm/amdgpu: don't use ATRM for external devices")

from the amdgpu 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/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 N=
ULL) {
 +	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;

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVIG9cACgkQAVBC80lX
0GwUfgf/WBtdZkkvfywcpEhQJHAb0ZO4m//Rz8kptrLOAflNsTtKfTlkNDkOgY+w
C5AB7Gz16fde2fnvOOUU4LWZD7lUdub3wPTJnuHF3i+P2zY5TKU52Td4HOxLtOcA
vFC4FQxForoCZWMcJvGPPBOzwE4vRgl7rSIBika6NuyJg8Fm9OTS7mDMD8AUF6+a
nXl1yjHZ2WfYp59ayeigLOpEZYwCqNnuphyepIA7tmTXFCHiPT8cofFQzYmrjA92
/5U+z6llH6i6ULjLzTKHnc97WEroMeNpN4hHrPusbBTb1yXlwlvtlhcV4ZsbB+jp
BEZdrYvPVe11oedEkDf3Eeak3jt/QQ==
=PVz8
-----END PGP SIGNATURE-----

--Sig_/URENiMlDcB9LImW7A4CTEOx--