Hi all,
On Mon, 6 Nov 2023 09:48:55 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> 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.
>
> --
> 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;
> +
> + /* ATRM is for on-platform devices only */
> + if (dev_is_removable(&adev->pdev->dev))
> + return false;
>
> - while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
> + while ((pdev = pci_get_base_class(PCI_BASE_CLASS_DISPLAY, pdev))) {
> + if ((pdev->class != PCI_CLASS_DISPLAY_VGA << 8) &&
> + (pdev->class != PCI_CLASS_DISPLAY_OTHER << 8))
> + continue;
> +
> dhandle = ACPI_HANDLE(&pdev->dev);
> if (!dhandle)
> continue;
This is now a conflict between the drm tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgp2DMUKORLBx.pgp
Description: OpenPGP digital signature
