linux-next: manual merge of the drm tree with the kbuild tree
Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/Kconfig.debug between commit: fcbb8461fd23 ("kbuild: remove header compile test") from the kbuild tree and commit: d30213e533fa ("drm/i915: Fix Kconfig indentation") 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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/Kconfig.debug index 41c8e39a73ba,eea79125b3ea.. --- a/drivers/gpu/drm/i915/Kconfig.debug +++ b/drivers/gpu/drm/i915/Kconfig.debug @@@ -1,33 -1,34 +1,33 @@@ # SPDX-License-Identifier: GPL-2.0-only config DRM_I915_WERROR - bool "Force GCC to throw an error instead of a warning when compiling" - # As this may inadvertently break the build, only allow the user - # to shoot oneself in the foot iff they aim really hard - depends on EXPERT - # We use the dependency on !COMPILE_TEST to not be enabled in - # allmodconfig or allyesconfig configurations - depends on !COMPILE_TEST - default n - help - Add -Werror to the build flags for (and only for) i915.ko. - Do not enable this unless you are writing code for the i915.ko module. - - Recommended for driver developers only. - - If in doubt, say "N". + bool "Force GCC to throw an error instead of a warning when compiling" + # As this may inadvertently break the build, only allow the user + # to shoot oneself in the foot iff they aim really hard + depends on EXPERT + # We use the dependency on !COMPILE_TEST to not be enabled in + # allmodconfig or allyesconfig configurations + depends on !COMPILE_TEST - select HEADER_TEST + default n + help + Add -Werror to the build flags for (and only for) i915.ko. + Do not enable this unless you are writing code for the i915.ko module. + + Recommended for driver developers only. + + If in doubt, say "N". config DRM_I915_DEBUG - bool "Enable additional driver debugging" - depends on DRM_I915 - select DEBUG_FS - select PREEMPT_COUNT - select REFCOUNT_FULL - select I2C_CHARDEV - select STACKDEPOT - select DRM_DP_AUX_CHARDEV - select X86_MSR # used by igt/pm_rpm - select DRM_VGEM # used by igt/prime_vgem (dmabuf interop checks) - select DRM_DEBUG_MM if DRM=y + bool "Enable additional driver debugging" + depends on DRM_I915 + select DEBUG_FS + select PREEMPT_COUNT + select REFCOUNT_FULL + select I2C_CHARDEV + select STACKDEPOT + select DRM_DP_AUX_CHARDEV + select X86_MSR # used by igt/pm_rpm + select DRM_VGEM # used by igt/prime_vgem (dmabuf interop checks) + select DRM_DEBUG_MM if DRM=y select DRM_DEBUG_SELFTEST select DMABUF_SELFTESTS select SW_SYNC # signaling validation framework (igt/syncobj*) pgps92gU0s34x.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 drm tree with the kbuild tree
On Mon, Sep 16, 2019 at 02:06:46PM -0700, Nick Desaulniers wrote: > On Sun, Sep 15, 2019 at 2:47 PM Mark Brown wrote: > > 0f0727d971f6fdf ("drm/amd/display: readd -msse2 to prevent Clang from > > emitting libcalls to undefined SW FP routines") > ^ this patch is now broken due to the SHA above it. Right, all the sites that didn't conflict are broken. Like I say I think there needs to be some coordination with the Kbuild changes here. > b/drivers/gpu/drm/amd/display/dc/dcn20/Makefile > index 2b399cfa72e6..ddb8d5649e79 100644 > --- a/drivers/gpu/drm/amd/display/dc/dcn20/Makefile > +++ b/drivers/gpu/drm/amd/display/dc/dcn20/Makefile > @@ -19,7 +19,7 @@ endif > CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o := -mhard-float -msse > $(cc_stack_align) I can't do anything with patches without signoffs so I'm not going to apply this as a workaround. > > + ifdef CONFIG_DRM_AMD_DC_DCN2_1 > > -CFLAGS_display_mode_vba_21.o := $(dml_ccflags) > > -CFLAGS_display_rq_dlg_calc_21.o := $(dml_ccflags) > > -endif > > ^ this endif should not be removed. There's an endif left there? Someone sent a patch, I'm going to apply that. signature.asc Description: PGP signature
Re: linux-next: manual merge of the drm tree with the kbuild tree
On Sun, Sep 15, 2019 at 2:47 PM Mark Brown wrote: > > Hi all, > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/amd/display/dc/dml/Makefile > > between commit: > > 54b8ae66ae1a345 ("kbuild: change *FLAGS_.o to take the path > relative to $(obj)") > > from the kbuild tree and commits: > > 0f0727d971f6fdf ("drm/amd/display: readd -msse2 to prevent Clang from > emitting libcalls to undefined SW FP routines") ^ this patch is now broken due to the SHA above it. diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/Makefile b/drivers/gpu/drm/amd/display/dc/dcn20/Makefile index 2b399cfa72e6..ddb8d5649e79 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/Makefile +++ b/drivers/gpu/drm/amd/display/dc/dcn20/Makefile @@ -19,7 +19,7 @@ endif CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o := -mhard-float -msse $(cc_stack_align) ifdef CONFIG_CC_IS_CLANG -CFLAGS_dcn20_resource.o += -msse2 +CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o += -msse2 endif AMD_DAL_DCN20 = $(addprefix $(AMDDALPATH)/dc/dcn20/,$(DCN20)) > 542816ff168d8a3 ("drm/amd/display: Add DCN2.1 changes to DML") > b04641a3f4c54b0 ("drm/amd/display: Add Renoir DML") > 057fc695e934a77 ("drm/amd/display: support "dummy pstate"") > > 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. > > diff --cc drivers/gpu/drm/amd/display/dc/dml/Makefile > index 83792e2c0f0e4,af2a864a6da05..0 > --- a/drivers/gpu/drm/amd/display/dc/dml/Makefile > +++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile > @@@ -32,16 -32,29 +32,25 @@@ 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) > -endif > +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) > ++CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20v2.o := $(dml_ccflags) > ++CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20v2.o := > $(dml_ccflags) > + ifdef CONFIG_DRM_AMD_DC_DCN2_1 > -CFLAGS_display_mode_vba_21.o := $(dml_ccflags) > -CFLAGS_display_rq_dlg_calc_21.o := $(dml_ccflags) > -endif ^ this endif should not be removed. > -ifdef CONFIG_DRM_AMD_DCN3AG > -CFLAGS_display_mode_vba_3ag.o := $(dml_ccflags) > ++CFLAGS_$(AMDDALPATH)/dc/dml/dcn21/display_mode_vba_21.o := $(dml_ccflags) > ++CFLAGS_$(AMDDALPATH)/dc/dml/dcn21/display_rq_dlg_calc_21.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 -- Thanks, ~Nick Desaulniers
linux-next: manual merge of the drm tree with the kbuild tree
Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/display/dc/dml/Makefile between commit: 54b8ae66ae1a345 ("kbuild: change *FLAGS_.o to take the path relative to $(obj)") from the kbuild tree and commits: 0f0727d971f6fdf ("drm/amd/display: readd -msse2 to prevent Clang from emitting libcalls to undefined SW FP routines") 542816ff168d8a3 ("drm/amd/display: Add DCN2.1 changes to DML") b04641a3f4c54b0 ("drm/amd/display: Add Renoir DML") 057fc695e934a77 ("drm/amd/display: support "dummy pstate"") 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. diff --cc drivers/gpu/drm/amd/display/dc/dml/Makefile index 83792e2c0f0e4,af2a864a6da05..0 --- a/drivers/gpu/drm/amd/display/dc/dml/Makefile +++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile @@@ -32,16 -32,29 +32,25 @@@ 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) -endif +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) ++CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20v2.o := $(dml_ccflags) ++CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20v2.o := $(dml_ccflags) + ifdef CONFIG_DRM_AMD_DC_DCN2_1 -CFLAGS_display_mode_vba_21.o := $(dml_ccflags) -CFLAGS_display_rq_dlg_calc_21.o := $(dml_ccflags) -endif -ifdef CONFIG_DRM_AMD_DCN3AG -CFLAGS_display_mode_vba_3ag.o := $(dml_ccflags) ++CFLAGS_$(AMDDALPATH)/dc/dml/dcn21/display_mode_vba_21.o := $(dml_ccflags) ++CFLAGS_$(AMDDALPATH)/dc/dml/dcn21/display_rq_dlg_calc_21.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 signature.asc Description: PGP 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 drm tree with the kbuild tree
On Tue, Sep 3, 2019 at 11:46 PM Stephen Rothwell 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_.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.. > --- 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.. > --- 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.. > --- 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 > -- Thanks, ~Nick Desaulniers ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
linux-next: manual merge of the drm tree with the kbuild tree
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_.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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/amd/display/dc/calcs/Makefile index d930df63772c,16614d73a5fc.. --- 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.. --- 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.. --- 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 pgpIrfWsl3LDd.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 drm tree with the kbuild tree
Hi all, On Wed, 19 Jun 2019 14:19:49 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/i915/Makefile.header-test > > between commit: > > e846f0dc57f4 ("kbuild: add support for ensuring headers are self-contained") > > from the kbuild tree and commits: > > 112ed2d31a46 ("drm/i915: Move GraphicsTechnology files under gt/") > d91e657876a9 ("drm/i915: Introduce struct intel_wakeref") > aab30b85c97a ("drm/i915: ensure more headers remain self-contained") > b375d0ef2589 ("drm/i915: extract intel_vdsc.h from intel_drv.h and > i915_drv.h") > > 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. > > -- > Cheers, > Stephen Rothwell > > diff --cc drivers/gpu/drm/i915/Makefile.header-test > index 639b596a06a9,3a9663002d4a.. > --- a/drivers/gpu/drm/i915/Makefile.header-test > +++ b/drivers/gpu/drm/i915/Makefile.header-test > @@@ -2,18 -2,28 +2,28 @@@ > # Copyright © 2019 Intel Corporation > > # Test the headers are compilable as standalone units > -header_test := \ > +header-test-$(CONFIG_DRM_I915_WERROR) := \ > i915_active_types.h \ > + i915_debugfs.h \ > + i915_drv.h \ > i915_gem_context_types.h \ > + i915_gem_pm.h \ > + i915_irq.h \ > + i915_params.h \ > i915_priolist_types.h \ > + i915_reg.h \ > i915_scheduler_types.h \ > i915_timeline_types.h \ > + i915_utils.h \ > + intel_acpi.h \ > + intel_atomic.h \ > intel_atomic_plane.h \ > intel_audio.h \ > + intel_bios.h \ > intel_cdclk.h \ > intel_color.h \ > + intel_combo_phy.h \ > intel_connector.h \ > - intel_context_types.h \ > intel_crt.h \ > intel_csr.h \ > intel_ddi.h \ > @@@ -31,7 -54,22 +54,12 @@@ > intel_pipe_crc.h \ > intel_pm.h \ > intel_psr.h \ > + intel_quirks.h \ > + intel_runtime_pm.h \ > intel_sdvo.h \ > + intel_sideband.h \ > intel_sprite.h \ > intel_tv.h \ > - intel_workarounds_types.h > + intel_uncore.h \ > + intel_vdsc.h \ > + intel_wakeref.h > - > -quiet_cmd_header_test = HDRTEST $@ > - cmd_header_test = echo "\#include \"$( $@ > - > -header_test_%.c: %.h > -$(call cmd,header_test) > - > -i915-$(CONFIG_DRM_I915_WERROR) += $(foreach h,$(header_test),$(patsubst > %.h,header_test_%.o,$(h))) > - > -clean-files += $(foreach h,$(header_test),$(patsubst > %.h,header_test_%.c,$(h))) I am still getting this conflict (the commit ids may have changed). Just a reminder in case you think Linus may need to know. -- Cheers, Stephen Rothwell pgpMBmCvnuQRy.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 drm tree with the kbuild tree
On Wed, 19 Jun 2019, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/i915/Makefile.header-test > > between commit: > > e846f0dc57f4 ("kbuild: add support for ensuring headers are self-contained") > > from the kbuild tree and commits: > > 112ed2d31a46 ("drm/i915: Move GraphicsTechnology files under gt/") > d91e657876a9 ("drm/i915: Introduce struct intel_wakeref") > aab30b85c97a ("drm/i915: ensure more headers remain self-contained") > b375d0ef2589 ("drm/i915: extract intel_vdsc.h from intel_drv.h and > i915_drv.h") > > 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. LGTM, thanks. BR, Jani. -- Jani Nikula, Intel Open Source Graphics Center ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
linux-next: manual merge of the drm tree with the kbuild tree
Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/Makefile.header-test between commit: e846f0dc57f4 ("kbuild: add support for ensuring headers are self-contained") from the kbuild tree and commits: 112ed2d31a46 ("drm/i915: Move GraphicsTechnology files under gt/") d91e657876a9 ("drm/i915: Introduce struct intel_wakeref") aab30b85c97a ("drm/i915: ensure more headers remain self-contained") b375d0ef2589 ("drm/i915: extract intel_vdsc.h from intel_drv.h and i915_drv.h") 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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/Makefile.header-test index 639b596a06a9,3a9663002d4a.. --- a/drivers/gpu/drm/i915/Makefile.header-test +++ b/drivers/gpu/drm/i915/Makefile.header-test @@@ -2,18 -2,28 +2,28 @@@ # Copyright © 2019 Intel Corporation # Test the headers are compilable as standalone units -header_test := \ +header-test-$(CONFIG_DRM_I915_WERROR) := \ i915_active_types.h \ + i915_debugfs.h \ + i915_drv.h \ i915_gem_context_types.h \ + i915_gem_pm.h \ + i915_irq.h \ + i915_params.h \ i915_priolist_types.h \ + i915_reg.h \ i915_scheduler_types.h \ i915_timeline_types.h \ + i915_utils.h \ + intel_acpi.h \ + intel_atomic.h \ intel_atomic_plane.h \ intel_audio.h \ + intel_bios.h \ intel_cdclk.h \ intel_color.h \ + intel_combo_phy.h \ intel_connector.h \ - intel_context_types.h \ intel_crt.h \ intel_csr.h \ intel_ddi.h \ @@@ -31,7 -54,22 +54,12 @@@ intel_pipe_crc.h \ intel_pm.h \ intel_psr.h \ + intel_quirks.h \ + intel_runtime_pm.h \ intel_sdvo.h \ + intel_sideband.h \ intel_sprite.h \ intel_tv.h \ - intel_workarounds_types.h + intel_uncore.h \ + intel_vdsc.h \ + intel_wakeref.h - -quiet_cmd_header_test = HDRTEST $@ - cmd_header_test = echo "\#include \"$( $@ - -header_test_%.c: %.h - $(call cmd,header_test) - -i915-$(CONFIG_DRM_I915_WERROR) += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h))) - -clean-files += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.c,$(h))) pgpNBKzPNtkS5.pgp Description: OpenPGP digital signature