* [PATCH 1/2] amdgpu/dc/dml: Consolidate redundant CFLAGS @ 2018-02-08 1:21 Matthias Kaehlcke 2018-02-08 1:21 ` [PATCH 2/2] amdgpu/dc/dml: Support clang option for stack alignment Matthias Kaehlcke 2018-02-08 1:32 ` [PATCH 1/2] amdgpu/dc/dml: Consolidate redundant CFLAGS Guenter Roeck 0 siblings, 2 replies; 5+ messages in thread From: Matthias Kaehlcke @ 2018-02-08 1:21 UTC (permalink / raw) To: Alex Deucher, Christian König, David Zhou, David Airlie, Harry Wentland, Felix Kuehling, Dmytro Laktyushkin Cc: amd-gfx, dri-devel, linux-kernel, Guenter Roeck, Justin TerAvest, Craig Bergstrom, Matthias Kaehlcke Use subdir-ccflags instead of specifying the same flags for every source file. Signed-off-by: Matthias Kaehlcke <mka@chromium.org> --- drivers/gpu/drm/amd/display/dc/dml/Makefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dml/Makefile b/drivers/gpu/drm/amd/display/dc/dml/Makefile index 3488af2b5786..b8cadf833e71 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/Makefile +++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile @@ -24,15 +24,7 @@ # It provides the general basic services required by other DAL # subcomponents. -CFLAGS_display_mode_vba.o := -mhard-float -msse -mpreferred-stack-boundary=4 -CFLAGS_display_mode_lib.o := -mhard-float -msse -mpreferred-stack-boundary=4 -CFLAGS_display_pipe_clocks.o := -mhard-float -msse -mpreferred-stack-boundary=4 -CFLAGS_display_rq_dlg_calc.o := -mhard-float -msse -mpreferred-stack-boundary=4 -CFLAGS_dml1_display_rq_dlg_calc.o := -mhard-float -msse -mpreferred-stack-boundary=4 -CFLAGS_display_rq_dlg_helpers.o := -mhard-float -msse -mpreferred-stack-boundary=4 -CFLAGS_soc_bounding_box.o := -mhard-float -msse -mpreferred-stack-boundary=4 -CFLAGS_dml_common_defs.o := -mhard-float -msse -mpreferred-stack-boundary=4 - +subdir-ccflags-y += -mhard-float -msse -mpreferred-stack-boundary=4 DML = display_mode_lib.o display_rq_dlg_calc.o \ display_rq_dlg_helpers.o dml1_display_rq_dlg_calc.o \ -- 2.16.0.rc1.238.g530d649a79-goog ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] amdgpu/dc/dml: Support clang option for stack alignment 2018-02-08 1:21 [PATCH 1/2] amdgpu/dc/dml: Consolidate redundant CFLAGS Matthias Kaehlcke @ 2018-02-08 1:21 ` Matthias Kaehlcke 2018-02-08 1:34 ` Guenter Roeck 2018-02-08 1:32 ` [PATCH 1/2] amdgpu/dc/dml: Consolidate redundant CFLAGS Guenter Roeck 1 sibling, 1 reply; 5+ messages in thread From: Matthias Kaehlcke @ 2018-02-08 1:21 UTC (permalink / raw) To: Alex Deucher, Christian König, David Zhou, David Airlie, Harry Wentland, Felix Kuehling, Dmytro Laktyushkin Cc: amd-gfx, dri-devel, linux-kernel, Guenter Roeck, Justin TerAvest, Craig Bergstrom, Matthias Kaehlcke DML uses the compiler option -mpreferred-stack-boundary=4 to configure a stack alignment of 16 bytes. Clang uses the option -mstack-alignment instead, which expects as parameter the alignment in bytes, and not a power of two like -mpreferred-stack-boundary. Probe for both compiler options and use the correct one, similar to what is done in arch/x86/Makefile. Reported-by: Guenter Roeck <groeck@chromium.org> Signed-off-by: Matthias Kaehlcke <mka@chromium.org> --- drivers/gpu/drm/amd/display/dc/dml/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/dml/Makefile b/drivers/gpu/drm/amd/display/dc/dml/Makefile index b8cadf833e71..740975931d21 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/Makefile +++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile @@ -24,7 +24,13 @@ # It provides the general basic services required by other DAL # subcomponents. -subdir-ccflags-y += -mhard-float -msse -mpreferred-stack-boundary=4 +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 + +subdir-ccflags-y += -mhard-float -msse $(cc_stack_align) DML = display_mode_lib.o display_rq_dlg_calc.o \ display_rq_dlg_helpers.o dml1_display_rq_dlg_calc.o \ -- 2.16.0.rc1.238.g530d649a79-goog ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] amdgpu/dc/dml: Support clang option for stack alignment 2018-02-08 1:21 ` [PATCH 2/2] amdgpu/dc/dml: Support clang option for stack alignment Matthias Kaehlcke @ 2018-02-08 1:34 ` Guenter Roeck 2018-02-08 1:37 ` Matthias Kaehlcke 0 siblings, 1 reply; 5+ messages in thread From: Guenter Roeck @ 2018-02-08 1:34 UTC (permalink / raw) To: Matthias Kaehlcke Cc: Alex Deucher, Christian König, David Zhou, David Airlie, Harry Wentland, Felix Kuehling, Dmytro Laktyushkin, amd-gfx list, Maling list - DRI developers, linux-kernel, Guenter Roeck, Justin TerAvest, Craig Bergstrom On Wed, Feb 7, 2018 at 5:21 PM, Matthias Kaehlcke <mka@chromium.org> wrote: > DML uses the compiler option -mpreferred-stack-boundary=4 to configure > a stack alignment of 16 bytes. Clang uses the option -mstack-alignment > instead, which expects as parameter the alignment in bytes, and not a > power of two like -mpreferred-stack-boundary. > > Probe for both compiler options and use the correct one, similar to > what is done in arch/x86/Makefile. > > Reported-by: Guenter Roeck <groeck@chromium.org> > Signed-off-by: Matthias Kaehlcke <mka@chromium.org> > --- > drivers/gpu/drm/amd/display/dc/dml/Makefile | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/dml/Makefile b/drivers/gpu/drm/amd/display/dc/dml/Makefile > index b8cadf833e71..740975931d21 100644 > --- a/drivers/gpu/drm/amd/display/dc/dml/Makefile > +++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile > @@ -24,7 +24,13 @@ > # It provides the general basic services required by other DAL > # subcomponents. > > -subdir-ccflags-y += -mhard-float -msse -mpreferred-stack-boundary=4 > +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 > + Any reason for using both = and := ? > +subdir-ccflags-y += -mhard-float -msse $(cc_stack_align) > > DML = display_mode_lib.o display_rq_dlg_calc.o \ > display_rq_dlg_helpers.o dml1_display_rq_dlg_calc.o \ > -- > 2.16.0.rc1.238.g530d649a79-goog > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] amdgpu/dc/dml: Support clang option for stack alignment 2018-02-08 1:34 ` Guenter Roeck @ 2018-02-08 1:37 ` Matthias Kaehlcke 0 siblings, 0 replies; 5+ messages in thread From: Matthias Kaehlcke @ 2018-02-08 1:37 UTC (permalink / raw) To: Guenter Roeck Cc: Alex Deucher, Christian König, David Zhou, David Airlie, Harry Wentland, Felix Kuehling, Dmytro Laktyushkin, amd-gfx list, Maling list - DRI developers, linux-kernel, Guenter Roeck, Justin TerAvest, Craig Bergstrom El Wed, Feb 07, 2018 at 05:34:44PM -0800 Guenter Roeck ha dit: > On Wed, Feb 7, 2018 at 5:21 PM, Matthias Kaehlcke <mka@chromium.org> wrote: > > DML uses the compiler option -mpreferred-stack-boundary=4 to configure > > a stack alignment of 16 bytes. Clang uses the option -mstack-alignment > > instead, which expects as parameter the alignment in bytes, and not a > > power of two like -mpreferred-stack-boundary. > > > > Probe for both compiler options and use the correct one, similar to > > what is done in arch/x86/Makefile. > > > > Reported-by: Guenter Roeck <groeck@chromium.org> > > Signed-off-by: Matthias Kaehlcke <mka@chromium.org> > > --- > > drivers/gpu/drm/amd/display/dc/dml/Makefile | 8 +++++++- > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/amd/display/dc/dml/Makefile b/drivers/gpu/drm/amd/display/dc/dml/Makefile > > index b8cadf833e71..740975931d21 100644 > > --- a/drivers/gpu/drm/amd/display/dc/dml/Makefile > > +++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile > > @@ -24,7 +24,13 @@ > > # It provides the general basic services required by other DAL > > # subcomponents. > > > > -subdir-ccflags-y += -mhard-float -msse -mpreferred-stack-boundary=4 > > +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 > > + > Any reason for using both = and := ? Not really, will fix. Thanks! ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] amdgpu/dc/dml: Consolidate redundant CFLAGS 2018-02-08 1:21 [PATCH 1/2] amdgpu/dc/dml: Consolidate redundant CFLAGS Matthias Kaehlcke 2018-02-08 1:21 ` [PATCH 2/2] amdgpu/dc/dml: Support clang option for stack alignment Matthias Kaehlcke @ 2018-02-08 1:32 ` Guenter Roeck 1 sibling, 0 replies; 5+ messages in thread From: Guenter Roeck @ 2018-02-08 1:32 UTC (permalink / raw) To: Matthias Kaehlcke Cc: Alex Deucher, Christian König, David Zhou, David Airlie, Harry Wentland, Felix Kuehling, Dmytro Laktyushkin, amd-gfx list, Maling list - DRI developers, linux-kernel, Guenter Roeck, Justin TerAvest, Craig Bergstrom On Wed, Feb 7, 2018 at 5:21 PM, Matthias Kaehlcke <mka@chromium.org> wrote: > Use subdir-ccflags instead of specifying the same flags for every source > file. > > Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-by: Guenter Roeck <groeck@chromium.org> > --- > drivers/gpu/drm/amd/display/dc/dml/Makefile | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/dml/Makefile b/drivers/gpu/drm/amd/display/dc/dml/Makefile > index 3488af2b5786..b8cadf833e71 100644 > --- a/drivers/gpu/drm/amd/display/dc/dml/Makefile > +++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile > @@ -24,15 +24,7 @@ > # It provides the general basic services required by other DAL > # subcomponents. > > -CFLAGS_display_mode_vba.o := -mhard-float -msse -mpreferred-stack-boundary=4 > -CFLAGS_display_mode_lib.o := -mhard-float -msse -mpreferred-stack-boundary=4 > -CFLAGS_display_pipe_clocks.o := -mhard-float -msse -mpreferred-stack-boundary=4 > -CFLAGS_display_rq_dlg_calc.o := -mhard-float -msse -mpreferred-stack-boundary=4 > -CFLAGS_dml1_display_rq_dlg_calc.o := -mhard-float -msse -mpreferred-stack-boundary=4 > -CFLAGS_display_rq_dlg_helpers.o := -mhard-float -msse -mpreferred-stack-boundary=4 > -CFLAGS_soc_bounding_box.o := -mhard-float -msse -mpreferred-stack-boundary=4 > -CFLAGS_dml_common_defs.o := -mhard-float -msse -mpreferred-stack-boundary=4 > - > +subdir-ccflags-y += -mhard-float -msse -mpreferred-stack-boundary=4 > > DML = display_mode_lib.o display_rq_dlg_calc.o \ > display_rq_dlg_helpers.o dml1_display_rq_dlg_calc.o \ > -- > 2.16.0.rc1.238.g530d649a79-goog > ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-02-08 1:37 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-02-08 1:21 [PATCH 1/2] amdgpu/dc/dml: Consolidate redundant CFLAGS Matthias Kaehlcke 2018-02-08 1:21 ` [PATCH 2/2] amdgpu/dc/dml: Support clang option for stack alignment Matthias Kaehlcke 2018-02-08 1:34 ` Guenter Roeck 2018-02-08 1:37 ` Matthias Kaehlcke 2018-02-08 1:32 ` [PATCH 1/2] amdgpu/dc/dml: Consolidate redundant CFLAGS Guenter Roeck
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox