Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the amdgpu tree with Linus' tree
@ 2019-10-28  1:11 Stephen Rothwell
  0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2019-10-28  1:11 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Kevin Wang,
	Evan Quan

[-- Attachment #1: Type: text/plain, Size: 829 bytes --]

Hi all,

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

  drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h

between commit:

  155f85c0d568 ("drm/amd/powerplay: remove duplicate macro smu_get_uclk_dpm_states in amdgpu_smu.h")

from Linus' tree and commit:

  18c1d3cee4c5 ("drm/amd/powerplay: split out those internal used swSMU APIs V2")

from the amdgpu tree.

I fixed it up (I just used the amdgpu tree 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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: linux-next: manual merge of the amdgpu tree with Linus' tree
  2019-10-28  0:57 Stephen Rothwell
@ 2019-10-28  1:13 ` Masahiro Yamada
  0 siblings, 0 replies; 7+ messages in thread
From: Masahiro Yamada @ 2019-10-28  1:13 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Alex Deucher, Linux Next Mailing List, Linux Kernel Mailing List,
	Nick Desaulniers

On Mon, Oct 28, 2019 at 9:57 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the amdgpu tree got a conflict in:
>
>   drivers/gpu/drm/amd/display/dc/dcn20/Makefile
>
> between commit:
>
>   54b8ae66ae1a ("kbuild: change *FLAGS_<basetarget>.o to take the path relative to $(obj)")
>
> from Linus' tree and commits:
>
>   4f952528add3 ("drm/amdgpu: fix stack alignment ABI mismatch for Clang")
>   971463bea55c ("drm/amdgpu: fix stack alignment ABI mismatch for GCC 7.1+")
>   101d09f07966 ("drm/amdgpu: enable -msse2 for GCC 7.1+ users")
>
> 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.


I believe subsystems should queue up patches
against -rc1 or a later tag.

Developing based on an older version
causes unneeded conflicts like this.




> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/gpu/drm/amd/display/dc/dcn20/Makefile
> index ddb8d5649e79,be3a614963c6..000000000000
> --- a/drivers/gpu/drm/amd/display/dc/dcn20/Makefile
> +++ b/drivers/gpu/drm/amd/display/dc/dcn20/Makefile
> @@@ -10,16 -10,21 +10,21 @@@ ifdef CONFIG_DRM_AMD_DC_DSC_SUPPOR
>   DCN20 += dcn20_dsc.o
>   endif
>
> - ifneq ($(call cc-option, -mpreferred-stack-boundary=4),)
> -       cc_stack_align := -mpreferred-stack-boundary=4
> - else ifneq ($(call cc-option, -mstack-alignment=16),)
> -       cc_stack_align := -mstack-alignment=16
> - endif
>  -CFLAGS_dcn20_resource.o := -mhard-float -msse
> ++CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o := -mhard-float -msse
>
> - CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o := -mhard-float -msse $(cc_stack_align)
> + ifdef CONFIG_CC_IS_GCC
> + ifeq ($(call cc-ifversion, -lt, 0701, y), y)
> + IS_OLD_GCC = 1
> + endif
> + endif
>
> - ifdef CONFIG_CC_IS_CLANG
> + ifdef IS_OLD_GCC
> + # Stack alignment mismatch, proceed with caution.
> + # GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boundary=3
> + # (8B stack alignment).
>  -CFLAGS_dcn20_resource.o += -mpreferred-stack-boundary=4
> ++CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o += -mpreferred-stack-boundary=4
> + else
>  -CFLAGS_dcn20_resource.o += -msse2
>  +CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o += -msse2
>   endif
>
>   AMD_DAL_DCN20 = $(addprefix $(AMDDALPATH)/dc/dcn20/,$(DCN20))



-- 
Best Regards
Masahiro Yamada

^ permalink raw reply	[flat|nested] 7+ messages in thread

* linux-next: manual merge of the amdgpu tree with Linus' tree
@ 2019-10-28  1:03 Stephen Rothwell
  0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2019-10-28  1:03 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Arnd Bergmann, Nick Desaulniers

[-- Attachment #1: Type: text/plain, Size: 2593 bytes --]

Hi all,

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

  drivers/gpu/drm/amd/display/dc/dcn21/Makefile

between commits:

  d7b0827f28ab ("Merge tag 'kbuild-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild")
  c0e70e10b11b ("drm/amd/display: fix dcn21 Makefile for clang")

from Linus' tree and commits:

  618f55831b84 ("drm/amd/display: fix dcn21 Makefile for clang")
  4f952528add3 ("drm/amdgpu: fix stack alignment ABI mismatch for Clang")
  971463bea55c ("drm/amdgpu: fix stack alignment ABI mismatch for GCC 7.1+")
  101d09f07966 ("drm/amdgpu: enable -msse2 for GCC 7.1+ users")

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/dc/dcn21/Makefile
index ef673bffc241,feb7e705e792..000000000000
--- a/drivers/gpu/drm/amd/display/dc/dcn21/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dcn21/Makefile
@@@ -1,18 -1,23 +1,23 @@@
  #
  # Makefile for DCN21.
  
- DCN21 = dcn21_hubp.o dcn21_hubbub.o dcn21_resource.o
+ DCN21 = dcn21_hubp.o dcn21_hubbub.o dcn21_resource.o dcn21_hwseq.o dcn21_link_encoder.o
  
- ifneq ($(call cc-option, -mpreferred-stack-boundary=4),)
- 	cc_stack_align := -mpreferred-stack-boundary=4
- else ifneq ($(call cc-option, -mstack-alignment=16),)
- 	cc_stack_align := -mstack-alignment=16
- endif
 -CFLAGS_dcn21_resource.o := -mhard-float -msse
++CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o := -mhard-float -msse
  
- CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o := -mhard-float -msse $(cc_stack_align)
+ ifdef CONFIG_CC_IS_GCC
+ ifeq ($(call cc-ifversion, -lt, 0701, y), y)
+ IS_OLD_GCC = 1
+ endif
+ endif
  
- ifdef CONFIG_CC_IS_CLANG
+ ifdef IS_OLD_GCC
+ # Stack alignment mismatch, proceed with caution.
+ # GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boundary=3
+ # (8B stack alignment).
 -CFLAGS_dcn21_resource.o += -mpreferred-stack-boundary=4
++CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o += -mpreferred-stack-boundary=4
+ else
 -CFLAGS_dcn21_resource.o += -msse2
 +CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o += -msse2
  endif
  
  AMD_DAL_DCN21 = $(addprefix $(AMDDALPATH)/dc/dcn21/,$(DCN21))

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* linux-next: manual merge of the amdgpu tree with Linus' tree
@ 2019-10-28  0:57 Stephen Rothwell
  2019-10-28  1:13 ` Masahiro Yamada
  0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2019-10-28  0:57 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Masahiro Yamada, Nick Desaulniers

[-- Attachment #1: Type: text/plain, Size: 2327 bytes --]

Hi all,

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

  drivers/gpu/drm/amd/display/dc/dcn20/Makefile

between commit:

  54b8ae66ae1a ("kbuild: change *FLAGS_<basetarget>.o to take the path relative to $(obj)")

from Linus' tree and commits:

  4f952528add3 ("drm/amdgpu: fix stack alignment ABI mismatch for Clang")
  971463bea55c ("drm/amdgpu: fix stack alignment ABI mismatch for GCC 7.1+")
  101d09f07966 ("drm/amdgpu: enable -msse2 for GCC 7.1+ users")

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/dc/dcn20/Makefile
index ddb8d5649e79,be3a614963c6..000000000000
--- a/drivers/gpu/drm/amd/display/dc/dcn20/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/Makefile
@@@ -10,16 -10,21 +10,21 @@@ ifdef CONFIG_DRM_AMD_DC_DSC_SUPPOR
  DCN20 += dcn20_dsc.o
  endif
  
- ifneq ($(call cc-option, -mpreferred-stack-boundary=4),)
- 	cc_stack_align := -mpreferred-stack-boundary=4
- else ifneq ($(call cc-option, -mstack-alignment=16),)
- 	cc_stack_align := -mstack-alignment=16
- endif
 -CFLAGS_dcn20_resource.o := -mhard-float -msse
++CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o := -mhard-float -msse
  
- CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o := -mhard-float -msse $(cc_stack_align)
+ ifdef CONFIG_CC_IS_GCC
+ ifeq ($(call cc-ifversion, -lt, 0701, y), y)
+ IS_OLD_GCC = 1
+ endif
+ endif
  
- ifdef CONFIG_CC_IS_CLANG
+ ifdef IS_OLD_GCC
+ # Stack alignment mismatch, proceed with caution.
+ # GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boundary=3
+ # (8B stack alignment).
 -CFLAGS_dcn20_resource.o += -mpreferred-stack-boundary=4
++CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o += -mpreferred-stack-boundary=4
+ else
 -CFLAGS_dcn20_resource.o += -msse2
 +CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o += -msse2
  endif
  
  AMD_DAL_DCN20 = $(addprefix $(AMDDALPATH)/dc/dcn20/,$(DCN20))

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* linux-next: manual merge of the amdgpu tree with Linus' tree
@ 2019-10-03  0:19 Stephen Rothwell
  0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2019-10-03  0:19 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Jason Gunthorpe, Yong Zhao

[-- Attachment #1: Type: text/plain, Size: 1258 bytes --]

Hi all,

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

  drivers/gpu/drm/amd/amdkfd/kfd_priv.h

between commit:

  471f39020569 ("drm/amdkfd: use mmu_notifier_put")

from Linus' tree and commit:

  4b3cece1863c ("drm/amdkfd: Use hex print format for pasid")

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/amdkfd/kfd_priv.h
index c89326125d71,fc8b81208368..000000000000
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@@ -687,7 -688,10 +688,7 @@@ struct kfd_process 
  	/* We want to receive a notification when the mm_struct is destroyed */
  	struct mmu_notifier mmu_notifier;
  
- 	unsigned int pasid;
 -	/* Use for delayed freeing of kfd_process structure */
 -	struct rcu_head	rcu;
 -
+ 	uint16_t pasid;
  	unsigned int doorbell_index;
  
  	/*

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* linux-next: manual merge of the amdgpu tree with Linus' tree
@ 2019-06-17  3:12 Stephen Rothwell
  0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2019-06-17  3:12 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Yintian Tao,
	Prike Liang, Trigger Huang

[-- Attachment #1: Type: text/plain, Size: 1090 bytes --]

Hi Alex,

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

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

between commits:

  192905989302 ("drm/amd/amdgpu: add RLC firmware to support raven1 refresh")
  f3a5231c8f14 ("drm/amdgpu: return 0 by default in amdgpu_pm_load_smu_firmware")

from Linus' tree and commits:

  80f41f84ae2c ("drm/amd/amdgpu: add RLC firmware to support raven1 refresh")
  4a39ec6ac5f3 ("drm/amdgpu: fix pm_load_smu_firmware for SR-IOV")
  e9bc1bf7916e ("drm/amdgpu: register pm sysfs for sriov (v2)")
  0079f82e710c ("drm/amdgpu: return 0 by default in amdgpu_pm_load_smu_firmware")

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.



-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* linux-next: manual merge of the amdgpu tree with Linus' tree
@ 2019-03-18 23:55 Stephen Rothwell
  0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2019-03-18 23:55 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Nicholas Kazlauskas, Dave Airlie, Mario Kleiner, David Francis

[-- Attachment #1: Type: text/plain, Size: 917 bytes --]

Hi all,

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

  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

between commits:

  d63716658ac1 ("drm/amd/display: Use vrr friendly pageflip throttling in DC.")
  634092b1b9f6 ("drm/amd/display: Use vrr friendly pageflip throttling in DC.")

from Linus' tree and commit:

  7b19bba58f77 ("drm/amd/display: Use vrr friendly pageflip throttling in DC.")

and following commits from the amdgpu tree.

I fixed it up (I used the version from the amdgpu tree) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, back to index

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-28  1:11 linux-next: manual merge of the amdgpu tree with Linus' tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
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

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git