Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Thu, 12 Dec 2019 11:03:37 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Alex Deucher <alexdeucher@gmail.com>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Nick Desaulniers <ndesaulniers@google.com>,
        Timothy Pearson <tpearson@raptorengineering.com>
Subject: linux-next: manual merge of the amdgpu tree with Linus' tree
Message-ID: <20191212110245.6f63732b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/RL5.V9g4ttp91kW6rpVU=8=";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/RL5.V9g4ttp91kW6rpVU=8=
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/gpu/drm/amd/display/dc/calcs/Makefile
  drivers/gpu/drm/amd/display/dc/dcn20/Makefile
  drivers/gpu/drm/amd/display/dc/dcn21/Makefile
  drivers/gpu/drm/amd/display/dc/dml/Makefile
  drivers/gpu/drm/amd/display/dc/dsc/Makefile

between commits:

  c868868f6b6a ("drm/amdgpu: fix stack alignment ABI mismatch for Clang")
  00db297106e8 ("drm/amdgpu: fix stack alignment ABI mismatch for GCC 7.1+")

from Linus' tree and commit:

  86462415d58d ("amdgpu: Enable initial DCN support on POWER")

from the amdgpu tree.

I fixed it up (I think .. 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/display/dc/calcs/Makefile
index 26c6d735cdc7,4d3006bd4337..000000000000
--- a/drivers/gpu/drm/amd/display/dc/calcs/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/calcs/Makefile
@@@ -24,22 -25,23 +25,30 @@@
  # It calculates Bandwidth and Watermarks values for HW programming
  #
 =20
 -ifneq ($(call cc-option, -mpreferred-stack-boundary=3D4),)
 -	cc_stack_align :=3D -mpreferred-stack-boundary=3D4
 -else ifneq ($(call cc-option, -mstack-alignment=3D16),)
 -	cc_stack_align :=3D -mstack-alignment=3D16
++ifdef CONFIG_X86
 +calcs_ccflags :=3D -mhard-float -msse
+ endif
+=20
 -ifdef CONFIG_X86
 -calcs_ccflags :=3D -mhard-float -msse $(cc_stack_align)
++ifdef CONFIG_PPC64
++calcs_ccflags :=3D -mhard-float -maltivec
++endif
 =20
 -ifdef CONFIG_CC_IS_CLANG
 -calcs_ccflags +=3D -msse2
 +ifdef CONFIG_CC_IS_GCC
 +ifeq ($(call cc-ifversion, -lt, 0701, y), y)
 +IS_OLD_GCC =3D 1
  endif
  endif
 =20
 -ifdef CONFIG_PPC64
 -calcs_ccflags :=3D -mhard-float -maltivec $(cc_stack_align)
 +ifdef IS_OLD_GCC
 +# Stack alignment mismatch, proceed with caution.
 +# GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boun=
dary=3D3
 +# (8B stack alignment).
 +calcs_ccflags +=3D -mpreferred-stack-boundary=3D4
 +else
++ifdef CONFIG_X86
 +calcs_ccflags +=3D -msse2
 +endif
+ endif
 =20
  CFLAGS_$(AMDDALPATH)/dc/calcs/dcn_calcs.o :=3D $(calcs_ccflags)
  CFLAGS_$(AMDDALPATH)/dc/calcs/dcn_calc_auto.o :=3D $(calcs_ccflags)
diff --cc drivers/gpu/drm/amd/display/dc/dcn20/Makefile
index 63f3bddba7da,07f652d40f86..000000000000
--- a/drivers/gpu/drm/amd/display/dc/dcn20/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/Makefile
@@@ -6,26 -7,25 +7,32 @@@ DCN20 =3D dcn20_resource.o dcn20_init.o d
  		dcn20_stream_encoder.o dcn20_link_encoder.o dcn20_dccg.o \
  		dcn20_vmid.o dcn20_dwb.o dcn20_dwb_scl.o
 =20
- ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
  DCN20 +=3D dcn20_dsc.o
- endif
 =20
 -ifneq ($(call cc-option, -mpreferred-stack-boundary=3D4),)
 -	cc_stack_align :=3D -mpreferred-stack-boundary=3D4
 -else ifneq ($(call cc-option, -mstack-alignment=3D16),)
 -	cc_stack_align :=3D -mstack-alignment=3D16
++ifdef CONFIG_X86
 +CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o :=3D -mhard-float -msse
+ endif
+=20
 -ifdef CONFIG_X86
 -CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o :=3D -mhard-float -msse $(=
cc_stack_align)
++ifdef CONFIG_PPC64
++CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o :=3D -mhard-float -maltivec
++endif
 =20
 -ifdef CONFIG_CC_IS_CLANG
 -CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o +=3D -msse2
 +ifdef CONFIG_CC_IS_GCC
 +ifeq ($(call cc-ifversion, -lt, 0701, y), y)
 +IS_OLD_GCC =3D 1
  endif
  endif
 =20
 -ifdef CONFIG_PPC64
 -CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o :=3D -mhard-float -maltive=
c $(cc_stack_align)
 +ifdef IS_OLD_GCC
 +# Stack alignment mismatch, proceed with caution.
 +# GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boun=
dary=3D3
 +# (8B stack alignment).
 +CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o +=3D -mpreferred-stack-bou=
ndary=3D4
 +else
++ifdef CONFIG_X86
 +CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o +=3D -msse2
 +endif
+ endif
 =20
  AMD_DAL_DCN20 =3D $(addprefix $(AMDDALPATH)/dc/dcn20/,$(DCN20))
 =20
diff --cc drivers/gpu/drm/amd/display/dc/dcn21/Makefile
index 14113ccf498d,041464d001bd..000000000000
--- a/drivers/gpu/drm/amd/display/dc/dcn21/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dcn21/Makefile
@@@ -1,24 -2,26 +2,33 @@@
  #
  # Makefile for DCN21.
 =20
- DCN21 =3D dcn21_hubp.o dcn21_hubbub.o dcn21_resource.o dcn21_hwseq.o dcn2=
1_link_encoder.o
+ DCN21 =3D dcn21_init.o dcn21_hubp.o dcn21_hubbub.o dcn21_resource.o \
+ 	 dcn21_hwseq.o dcn21_link_encoder.o
 =20
 -ifneq ($(call cc-option, -mpreferred-stack-boundary=3D4),)
 -	cc_stack_align :=3D -mpreferred-stack-boundary=3D4
 -else ifneq ($(call cc-option, -mstack-alignment=3D16),)
 -	cc_stack_align :=3D -mstack-alignment=3D16
++ifdef CONFIG_X86
 +CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o :=3D -mhard-float -msse
+ endif
+=20
 -ifdef CONFIG_X86
 -CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o :=3D -mhard-float -msse $(=
cc_stack_align)
++ifdef CONFIG_PPC64
++CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o :=3D -mhard-float -maltivec
++endif
 =20
 -ifdef CONFIG_CC_IS_CLANG
 -CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o +=3D -msse2
 +ifdef CONFIG_CC_IS_GCC
 +ifeq ($(call cc-ifversion, -lt, 0701, y), y)
 +IS_OLD_GCC =3D 1
  endif
  endif
 =20
 -ifdef CONFIG_PPC64
 -CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o :=3D -mhard-float -maltive=
c $(cc_stack_align)
 +ifdef IS_OLD_GCC
 +# Stack alignment mismatch, proceed with caution.
 +# GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boun=
dary=3D3
 +# (8B stack alignment).
 +CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o +=3D -mpreferred-stack-bou=
ndary=3D4
 +else
++ifdef CONFIG_X86
 +CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o +=3D -msse2
 +endif
+ endif
 =20
  AMD_DAL_DCN21 =3D $(addprefix $(AMDDALPATH)/dc/dcn21/,$(DCN21))
 =20
diff --cc drivers/gpu/drm/amd/display/dc/dml/Makefile
index 8df251626e22,82c8978c81ab..000000000000
--- a/drivers/gpu/drm/amd/display/dc/dml/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile
@@@ -24,22 -25,23 +25,30 @@@
  # It provides the general basic services required by other DAL
  # subcomponents.
 =20
 -ifneq ($(call cc-option, -mpreferred-stack-boundary=3D4),)
 -	cc_stack_align :=3D -mpreferred-stack-boundary=3D4
 -else ifneq ($(call cc-option, -mstack-alignment=3D16),)
 -	cc_stack_align :=3D -mstack-alignment=3D16
++ifdef CONFIG_X86
 +dml_ccflags :=3D -mhard-float -msse
+ endif
+=20
 -ifdef CONFIG_X86
 -dml_ccflags :=3D -mhard-float -msse $(cc_stack_align)
++ifdef CONFIG_PPC64
++dml_ccflags :=3D -mhard-float -maltivec
++endif
 =20
 -ifdef CONFIG_CC_IS_CLANG
 -dml_ccflags +=3D -msse2
 +ifdef CONFIG_CC_IS_GCC
 +ifeq ($(call cc-ifversion, -lt, 0701, y), y)
 +IS_OLD_GCC =3D 1
  endif
  endif
 =20
 -ifdef CONFIG_PPC64
 -dml_ccflags :=3D -mhard-float -maltivec $(cc_stack_align)
 +ifdef IS_OLD_GCC
 +# Stack alignment mismatch, proceed with caution.
 +# GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boun=
dary=3D3
 +# (8B stack alignment).
 +dml_ccflags +=3D -mpreferred-stack-boundary=3D4
 +else
++ifdef CONFIG_X86
 +dml_ccflags +=3D -msse2
 +endif
+ endif
 =20
  CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_lib.o :=3D $(dml_ccflags)
 =20
diff --cc drivers/gpu/drm/amd/display/dc/dsc/Makefile
index 970737217e53,08edd919ec82..000000000000
--- a/drivers/gpu/drm/amd/display/dc/dsc/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dsc/Makefile
@@@ -1,22 -2,23 +2,30 @@@
  #
  # Makefile for the 'dsc' sub-component of DAL.
 =20
 -ifneq ($(call cc-option, -mpreferred-stack-boundary=3D4),)
 -	cc_stack_align :=3D -mpreferred-stack-boundary=3D4
 -else ifneq ($(call cc-option, -mstack-alignment=3D16),)
 -	cc_stack_align :=3D -mstack-alignment=3D16
++ifdef CONFIG_X86
 +dsc_ccflags :=3D -mhard-float -msse
+ endif
+=20
 -ifdef CONFIG_X86
 -dsc_ccflags :=3D -mhard-float -msse $(cc_stack_align)
++ifdef CONFIG_PPC64
++dsc_ccflags :=3D -mhard-float -maltivec
++endif
 =20
 -ifdef CONFIG_CC_IS_CLANG
 -dsc_ccflags +=3D -msse2
 +ifdef CONFIG_CC_IS_GCC
 +ifeq ($(call cc-ifversion, -lt, 0701, y), y)
 +IS_OLD_GCC =3D 1
  endif
  endif
 =20
 -ifdef CONFIG_PPC64
 -dsc_ccflags :=3D -mhard-float -maltivec $(cc_stack_align)
 +ifdef IS_OLD_GCC
 +# Stack alignment mismatch, proceed with caution.
 +# GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boun=
dary=3D3
 +# (8B stack alignment).
 +dsc_ccflags +=3D -mpreferred-stack-boundary=3D4
 +else
++ifdef CONFIG_X86
 +dsc_ccflags +=3D -msse2
 +endif
+ endif
 =20
  CFLAGS_$(AMDDALPATH)/dc/dsc/rc_calc.o :=3D $(dsc_ccflags)
  CFLAGS_$(AMDDALPATH)/dc/dsc/rc_calc_dpi.o :=3D $(dsc_ccflags)

--Sig_/RL5.V9g4ttp91kW6rpVU=8=
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl3xg9kACgkQAVBC80lX
0GxWnwf+Ll2e8+jgwnaI0W2OuAInjQy0M8XXpVoCvWfifLKRgBSID6+6QQJDE8eq
E9HQKzlGhbV7ChNkWjVFYzqfXGiEESXrDILJc9YN/5UkclX+uZ0E+EV6Ur16WSub
qyxJW2qFBsOHf0v5hoxX5nmW0VYHK4jYZMJF4ijXEc/gQ2YtJK6a+Ik8o+0Y+o0p
R0ho7eIqsRhzZDs1FVjXLEZMr3A+MRs/G7X0ck4UQs6pWW5Th9THHHg2fyDl7qub
qHoenRbLD6S/mGJZDoQkmisCPTUkdqVURJUaKadPxVe1dDaku6UPKAM2Yyd+XHSC
UfCqFeZeZh/wetnCZ+LEZYC4d8AihQ==
=uvTZ
-----END PGP SIGNATURE-----

--Sig_/RL5.V9g4ttp91kW6rpVU=8=--