Re: linux-next: manual merge of the amdgpu tree with Linus' tree
Hi all, On Mon, 6 Nov 2023 09:48:55 +1100 Stephen Rothwell 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.. > --- 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(>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(>dev); > if (!dhandle) > continue; This is now a conflict between the drm tree and Linus' tree. -- Cheers, Stephen Rothwell pgpfND900uZJK.pgp Description: OpenPGP digital signature
linux-next: manual merge of the amdgpu tree with Linus' tree
Hi all, Today's linux-next merge of the amdgpu tree got a conflict in: drivers/gpu/drm/amd/display/Kconfig between commits: 78f0929884d4 ("powerpc/64: Always build with 128-bit long double") 70cc1b5307e8 ("Merge tag 'powerpc-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux") from Linus' tree and commit: d3295311e589 ("drm/amdgpu/display: Enable DC_FP for LoongArch") 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/display/Kconfig index 2d8e55e29637,b015c7d19531.. --- a/drivers/gpu/drm/amd/display/Kconfig +++ b/drivers/gpu/drm/amd/display/Kconfig @@@ -8,7 -8,7 +8,7 @@@ config DRM_AMD_D depends on BROKEN || !CC_IS_CLANG || X86_64 || SPARC64 || ARM64 select SND_HDA_COMPONENT if SND_HDA_CORE # !CC_IS_CLANG: https://github.com/ClangBuiltLinux/linux/issues/1752 - select DRM_AMD_DC_FP if (X86 || (PPC64 && ALTIVEC) || (ARM64 && KERNEL_MODE_NEON && !CC_IS_CLANG)) - select DRM_AMD_DC_FP if (X86 || LOONGARCH || PPC64 || (ARM64 && KERNEL_MODE_NEON && !CC_IS_CLANG)) ++ select DRM_AMD_DC_FP if (X86 || LOONGARCH || (PPC64 && ALTIVEC) || (ARM64 && KERNEL_MODE_NEON && !CC_IS_CLANG)) help Choose this option if you want to use the new display engine support for AMDGPU. This adds required support for Vega and pgpBhBMarcJYp.pgp Description: OpenPGP digital signature
Re: linux-next: manual merge of the amdgpu tree with Linus' tree
Hi all, On Thu, 2 Sep 2021 11:22:08 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the amdgpu tree got a conflict in: > > drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c > > between commit: > > 477f70cd2a67 ("Merge tag 'drm-next-2021-08-31-1' of > git://anongit.freedesktop.org/drm/drm") > > from Linus' tree and commit: > > cc947bf91bad ("drm/amdgpu: Process any VBIOS RAS EEPROM address") > > from the amdgpu tree. > > I fixed it up (I used the latter version) 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. This is now a conflict between the drm tree and Linus' tree. -- Cheers, Stephen Rothwell pgpqLRgDkJypc.pgp Description: OpenPGP digital signature
linux-next: manual merge of the amdgpu tree with Linus' tree
Hi all, Today's linux-next merge of the amdgpu tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c between commits: 0fe438cec9e1 ("drm/ttm: remove default caching") 9c3006a4cc1b ("drm/ttm: remove available_caching") from Linus' tree and commit: d836917da7e5 ("drm/amdgpu: Fix size calculation when init onchip memory") 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_ttm.c index 8039d2399584,11dd3d9eac15.. --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@@ -63,16 -63,13 +63,16 @@@ #define AMDGPU_TTM_VRAM_MAX_DW_READ (size_t)128 +static int amdgpu_ttm_backend_bind(struct ttm_bo_device *bdev, + struct ttm_tt *ttm, + struct ttm_resource *bo_mem); + static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev, unsigned int type, - uint64_t size) + uint64_t size_in_page) { return ttm_range_man_init(>mman.bdev, type, - false, size >> PAGE_SHIFT); -TTM_PL_FLAG_UNCACHED, TTM_PL_FLAG_UNCACHED, + false, size_in_page); } /** pgp1ygVUJjRzf.pgp Description: OpenPGP digital signature ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: linux-next: manual merge of the amdgpu tree with Linus' tree
On Thu, Jul 23, 2020 at 4:01 AM Daniel Vetter wrote: > > On Wed, Jul 22, 2020 at 6:34 AM Stephen Rothwell > wrote: > > > > Hi all, > > > > [I can't find a previous email about this, sorry ...] > > > > There is a semantic conflict between Linus' tree and the amdgpu tree > > between commit > > > > d7a6634a4cfb ("drm/amdgpu/atomfirmware: fix vram_info fetching for > > renoir") > > > > from Linus' tree and commts > > > > fe098a5d6443 ("drm/amdgpu/atomfirmware: fix vram_info fetching for > > renoir") > > 836dab851903 ("drm/amdgpu/atomfirmware: update vram info handling for > > renoir") > > > > The automted git merge leaves two "case 12" labels. I have been > > reverting commit d7a6634a4cfb since July 3 ... This will need to be > > fixed up when the amdgpu tree is next merged into the drm tree, or a back > > merge of d7a6634a4cfb could be done into the amdgpu tree and the older > > "case 12" label removed in that merge. > > Yeah this is a bit nasty, I just crashed over it too (btw moved to > drm-next now). Alex is this the right conflict resolution for -next? I > think we should bake this in with a backmerge ... Yes, you can drop either d7a6634a4cfb or fe098a5d6443. I just cherry-picked the commit from -next back to 5.8 and stable since it was a bug fix. Alex > -Daniel > > > > > -- > > Cheers, > > Stephen Rothwell > > ___ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: linux-next: manual merge of the amdgpu tree with Linus' tree
On Wed, Jul 22, 2020 at 6:34 AM Stephen Rothwell wrote: > > Hi all, > > [I can't find a previous email about this, sorry ...] > > There is a semantic conflict between Linus' tree and the amdgpu tree > between commit > > d7a6634a4cfb ("drm/amdgpu/atomfirmware: fix vram_info fetching for renoir") > > from Linus' tree and commts > > fe098a5d6443 ("drm/amdgpu/atomfirmware: fix vram_info fetching for renoir") > 836dab851903 ("drm/amdgpu/atomfirmware: update vram info handling for > renoir") > > The automted git merge leaves two "case 12" labels. I have been > reverting commit d7a6634a4cfb since July 3 ... This will need to be > fixed up when the amdgpu tree is next merged into the drm tree, or a back > merge of d7a6634a4cfb could be done into the amdgpu tree and the older > "case 12" label removed in that merge. Yeah this is a bit nasty, I just crashed over it too (btw moved to drm-next now). Alex is this the right conflict resolution for -next? I think we should bake this in with a backmerge ... -Daniel > > -- > Cheers, > Stephen Rothwell > ___ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
linux-next: manual merge of the amdgpu tree with Linus' tree
Hi all, [I can't find a previous email about this, sorry ...] There is a semantic conflict between Linus' tree and the amdgpu tree between commit d7a6634a4cfb ("drm/amdgpu/atomfirmware: fix vram_info fetching for renoir") from Linus' tree and commts fe098a5d6443 ("drm/amdgpu/atomfirmware: fix vram_info fetching for renoir") 836dab851903 ("drm/amdgpu/atomfirmware: update vram info handling for renoir") The automted git merge leaves two "case 12" labels. I have been reverting commit d7a6634a4cfb since July 3 ... This will need to be fixed up when the amdgpu tree is next merged into the drm tree, or a back merge of d7a6634a4cfb could be done into the amdgpu tree and the older "case 12" label removed in that merge. -- Cheers, Stephen Rothwell pgpwPjzdoCcT7.pgp Description: OpenPGP digital signature ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel