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
Date: Tue, 7 Nov 2023 10:49:17 +1100 [thread overview]
Message-ID: <20231107104917.09180c14@canb.auug.org.au> (raw)
In-Reply-To: <20231106094855.38376d52@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1884 bytes --]
Hi all,
On Mon, 6 Nov 2023 09:48:55 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-11-06 23:49 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-05 22:48 linux-next: manual merge of the amdgpu tree with Linus' tree Stephen Rothwell
2023-11-06 23:49 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-07-24 1:14 Stephen Rothwell
2023-05-12 0:38 Stephen Rothwell
2022-07-19 2:00 Stephen Rothwell
2022-01-26 23:32 Stephen Rothwell
2022-01-26 23:29 Stephen Rothwell
2022-01-11 23:09 Stephen Rothwell
2021-09-02 1:22 Stephen Rothwell
2021-09-10 1:16 ` Stephen Rothwell
2021-08-02 15:10 Mark Brown
2021-08-02 15:48 ` Mark Brown
2021-07-06 0:52 Stephen Rothwell
2021-01-15 0:53 Stephen Rothwell
2021-01-08 1:04 Stephen Rothwell
2020-11-03 3:10 Stephen Rothwell
2020-10-27 0:48 Stephen Rothwell
2020-10-16 1:48 Stephen Rothwell
2020-08-25 1:35 Stephen Rothwell
2020-07-22 4:34 Stephen Rothwell
2020-07-23 8:01 ` Daniel Vetter
2020-07-23 13:34 ` Alex Deucher
2019-12-12 0:03 Stephen Rothwell
2019-12-12 0:11 ` Stephen Rothwell
2019-12-12 0:16 ` Timothy Pearson
2019-12-11 23:37 Stephen Rothwell
2019-12-12 0:10 ` Stephen Rothwell
2019-10-28 1:11 Stephen Rothwell
2019-10-28 1:03 Stephen Rothwell
2019-10-28 0:57 Stephen Rothwell
2019-10-28 1:13 ` Masahiro Yamada
2019-10-03 0:19 Stephen Rothwell
2019-06-17 3:12 Stephen Rothwell
2019-03-18 23:55 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231107104917.09180c14@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@redhat.com \
--cc=alexander.deucher@amd.com \
--cc=alexdeucher@gmail.com \
--cc=bhelgaas@google.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=suijingfeng@loongson.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).