Applied. Thanks! Alex On Tue, Jun 29, 2021 at 11:10 AM Harry Wentland <harry.wentland@xxxxxxx> wrote: > > On 2021-06-28 9:27 p.m., Reka Norman wrote: > > Setting CONFIG_FRAME_WARN=0 should disable 'stack frame larger than' > > warnings. This is useful for example in KASAN builds. Make the dml > > Makefile respect this config. > > > > Fixes the following build warnings with CONFIG_KASAN=y and > > CONFIG_FRAME_WARN=0: > > > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn30/display_mode_vba_30.c:3642:6: > > warning: stack frame size of 2216 bytes in function > > 'dml30_ModeSupportAndSystemConfigurationFull' [-Wframe-larger-than=] > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn31/display_mode_vba_31.c:3957:6: > > warning: stack frame size of 2568 bytes in function > > 'dml31_ModeSupportAndSystemConfigurationFull' [-Wframe-larger-than=] > > > > Signed-off-by: Reka Norman <rekanorman@xxxxxxxxxx> > > Reviewed-by: Harry Wentland <harry.wentland@xxxxxxx> > > Harry > > > --- > > > > drivers/gpu/drm/amd/display/dc/dml/Makefile | 8 ++++++-- > > 1 file changed, 6 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/amd/display/dc/dml/Makefile b/drivers/gpu/drm/amd/display/dc/dml/Makefile > > index d34024fd798a..45862167e6ce 100644 > > --- a/drivers/gpu/drm/amd/display/dc/dml/Makefile > > +++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile > > @@ -50,6 +50,10 @@ dml_ccflags += -msse2 > > endif > > endif > > > > +ifneq ($(CONFIG_FRAME_WARN),0) > > +frame_warn_flag := -Wframe-larger-than=2048 > > +endif > > + > > CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_ccflags) > > > > ifdef CONFIG_DRM_AMD_DC_DCN > > @@ -60,9 +64,9 @@ 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) > > 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) > > -CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_mode_vba_30.o := $(dml_ccflags) -Wframe-larger-than=2048 > > +CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_mode_vba_30.o := $(dml_ccflags) $(frame_warn_flag) > > CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_rq_dlg_calc_30.o := $(dml_ccflags) > > -CFLAGS_$(AMDDALPATH)/dc/dml/dcn31/display_mode_vba_31.o := $(dml_ccflags) -Wframe-larger-than=2048 > > +CFLAGS_$(AMDDALPATH)/dc/dml/dcn31/display_mode_vba_31.o := $(dml_ccflags) $(frame_warn_flag) > > CFLAGS_$(AMDDALPATH)/dc/dml/dcn31/display_rq_dlg_calc_31.o := $(dml_ccflags) > > CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_ccflags) > > CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_rcflags) > > > > _______________________________________________ > amd-gfx mailing list > amd-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
