| Message ID | 20190904164622.57f69595@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the drm tree with the kbuild tree | expand |
On Tue, Sep 3, 2019 at 11:46 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Hi all, > > Today's linux-next merge of the drm tree got conflicts in: > > drivers/gpu/drm/amd/display/dc/calcs/Makefile > drivers/gpu/drm/amd/display/dc/dml/Makefile > drivers/gpu/drm/amd/display/dc/dsc/Makefile > > between commit: > > 30851871d5ab ("kbuild: change *FLAGS_<basetarget>.o to take the path relative to $(obj)") > > from the kbuild tree and commit: > > 0f0727d971f6 ("drm/amd/display: readd -msse2 to prevent Clang from emitting libcalls to undefined SW FP routines") > > from the drm 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. My changes LGTM, thanks! > > -- > Cheers, > Stephen Rothwell > > diff --cc drivers/gpu/drm/amd/display/dc/calcs/Makefile > index d930df63772c,16614d73a5fc..000000000000 > --- a/drivers/gpu/drm/amd/display/dc/calcs/Makefile > +++ b/drivers/gpu/drm/amd/display/dc/calcs/Makefile > @@@ -32,9 -32,13 +32,13 @@@ endi > > calcs_ccflags := -mhard-float -msse $(cc_stack_align) > > + ifdef CONFIG_CC_IS_CLANG > + calcs_ccflags += -msse2 > + endif > + > -CFLAGS_dcn_calcs.o := $(calcs_ccflags) > -CFLAGS_dcn_calc_auto.o := $(calcs_ccflags) > -CFLAGS_dcn_calc_math.o := $(calcs_ccflags) -Wno-tautological-compare > +CFLAGS_$(AMDDALPATH)/dc/calcs/dcn_calcs.o := $(calcs_ccflags) > +CFLAGS_$(AMDDALPATH)/dc/calcs/dcn_calc_auto.o := $(calcs_ccflags) > +CFLAGS_$(AMDDALPATH)/dc/calcs/dcn_calc_math.o := $(calcs_ccflags) -Wno-tautological-compare > > BW_CALCS = dce_calcs.o bw_fixed.o custom_float.o > > diff --cc drivers/gpu/drm/amd/display/dc/dml/Makefile > index 83792e2c0f0e,95fd2beca80c..000000000000 > --- a/drivers/gpu/drm/amd/display/dc/dml/Makefile > +++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile > @@@ -32,16 -32,25 +32,20 @@@ endi > > dml_ccflags := -mhard-float -msse $(cc_stack_align) > > + ifdef CONFIG_CC_IS_CLANG > + dml_ccflags += -msse2 > + endif > + > -CFLAGS_display_mode_lib.o := $(dml_ccflags) > +CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_ccflags) > > ifdef CONFIG_DRM_AMD_DC_DCN2_0 > -CFLAGS_display_mode_vba.o := $(dml_ccflags) > -CFLAGS_display_mode_vba_20.o := $(dml_ccflags) > -CFLAGS_display_rq_dlg_calc_20.o := $(dml_ccflags) > -CFLAGS_display_mode_vba_20v2.o := $(dml_ccflags) > -CFLAGS_display_rq_dlg_calc_20v2.o := $(dml_ccflags) > +CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_ccflags) > +CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20.o := $(dml_ccflags) > +CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20.o := $(dml_ccflags) > endif > -ifdef CONFIG_DRM_AMD_DCN3AG > -CFLAGS_display_mode_vba_3ag.o := $(dml_ccflags) > -endif > -CFLAGS_dml1_display_rq_dlg_calc.o := $(dml_ccflags) > -CFLAGS_display_rq_dlg_helpers.o := $(dml_ccflags) > -CFLAGS_dml_common_defs.o := $(dml_ccflags) > +CFLAGS_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_ccflags) > +CFLAGS_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers.o := $(dml_ccflags) > +CFLAGS_$(AMDDALPATH)/dc/dml/dml_common_defs.o := $(dml_ccflags) > > DML = display_mode_lib.o display_rq_dlg_helpers.o dml1_display_rq_dlg_calc.o \ > dml_common_defs.o > diff --cc drivers/gpu/drm/amd/display/dc/dsc/Makefile > index c3922d6e7696,17db603f2d1f..000000000000 > --- a/drivers/gpu/drm/amd/display/dc/dsc/Makefile > +++ b/drivers/gpu/drm/amd/display/dc/dsc/Makefile > @@@ -9,9 -9,14 +9,13 @@@ endi > > dsc_ccflags := -mhard-float -msse $(cc_stack_align) > > + ifdef CONFIG_CC_IS_CLANG > + dsc_ccflags += -msse2 > + endif > + > -CFLAGS_rc_calc.o := $(dsc_ccflags) > -CFLAGS_rc_calc_dpi.o := $(dsc_ccflags) > -CFLAGS_codec_main_amd.o := $(dsc_ccflags) > -CFLAGS_dc_dsc.o := $(dsc_ccflags) > +CFLAGS_$(AMDDALPATH)/dc/dsc/rc_calc.o := $(dsc_ccflags) > +CFLAGS_$(AMDDALPATH)/dc/dsc/rc_calc_dpi.o := $(dsc_ccflags) > +CFLAGS_$(AMDDALPATH)/dc/dsc/dc_dsc.o := $(dsc_ccflags) > > DSC = dc_dsc.o rc_calc.o rc_calc_dpi.o >
diff --cc drivers/gpu/drm/amd/display/dc/calcs/Makefile index d930df63772c,16614d73a5fc..000000000000 --- a/drivers/gpu/drm/amd/display/dc/calcs/Makefile diff --cc drivers/gpu/drm/amd/display/dc/dml/Makefile index 83792e2c0f0e,95fd2beca80c..000000000000 --- a/drivers/gpu/drm/amd/display/dc/dml/Makefile diff --cc drivers/gpu/drm/amd/display/dc/dsc/Makefile index c3922d6e7696,17db603f2d1f..000000000000 --- a/drivers/gpu/drm/amd/display/dc/dsc/Makefile
Hi all, Today's linux-next merge of the drm tree got conflicts in: drivers/gpu/drm/amd/display/dc/calcs/Makefile drivers/gpu/drm/amd/display/dc/dml/Makefile drivers/gpu/drm/amd/display/dc/dsc/Makefile between commit: 30851871d5ab ("kbuild: change *FLAGS_<basetarget>.o to take the path relative to $(obj)") from the kbuild tree and commit: 0f0727d971f6 ("drm/amd/display: readd -msse2 to prevent Clang from emitting libcalls to undefined SW FP routines") from the drm 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.