diff mbox series

drm/amd/display: Respect CONFIG_FRAME_WARN=0 in DML2

Message ID 20231018-amdgpu-dml2-respect-frame_warn-v1-1-43ec8d153743@kernel.org (mailing list archive)
State New, archived
Headers show
Series drm/amd/display: Respect CONFIG_FRAME_WARN=0 in DML2 | expand

Commit Message

Nathan Chancellor Oct. 18, 2023, 6:45 p.m. UTC 
display_mode_code.c is unconditionally built with
-Wframe-larger-than=2048, which causes warnings even when
CONFIG_FRAME_WARN has been set to 0, which should show no warnings.

Use the existing $(frame_warn_flag) variable, which handles this
situation. This is basically commit 25f178bbd078 ("drm/amd/display:
Respect CONFIG_FRAME_WARN=0 in dml Makefile") but for DML2.

Fixes: 7966f319c66d ("drm/amd/display: Introduce DML2")
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
 drivers/gpu/drm/amd/display/dc/dml2/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


---
base-commit: cd90511557fdfb394bb4ac4c3b539b007383914c
change-id: 20231018-amdgpu-dml2-respect-frame_warn-536e19b69ce0

Best regards,

Comments

Hamza Mahfooz Oct. 18, 2023, 7:06 p.m. UTC | #1 
On 10/18/23 14:45, Nathan Chancellor wrote:
> display_mode_code.c is unconditionally built with
> -Wframe-larger-than=2048, which causes warnings even when
> CONFIG_FRAME_WARN has been set to 0, which should show no warnings.
> 
> Use the existing $(frame_warn_flag) variable, which handles this
> situation. This is basically commit 25f178bbd078 ("drm/amd/display:
> Respect CONFIG_FRAME_WARN=0 in dml Makefile") but for DML2.
> 
> Fixes: 7966f319c66d ("drm/amd/display: Introduce DML2")
> Signed-off-by: Nathan Chancellor <nathan@kernel.org>

Applied, thanks!

> ---
>   drivers/gpu/drm/amd/display/dc/dml2/Makefile | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/dml2/Makefile b/drivers/gpu/drm/amd/display/dc/dml2/Makefile
> index f35ed8de260d..66431525f2a0 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml2/Makefile
> +++ b/drivers/gpu/drm/amd/display/dc/dml2/Makefile
> @@ -61,7 +61,7 @@ ifneq ($(CONFIG_FRAME_WARN),0)
>   frame_warn_flag := -Wframe-larger-than=2048
>   endif
>   
> -CFLAGS_$(AMDDALPATH)/dc/dml2/display_mode_core.o := $(dml2_ccflags) -Wframe-larger-than=2048
> +CFLAGS_$(AMDDALPATH)/dc/dml2/display_mode_core.o := $(dml2_ccflags) $(frame_warn_flag)
>   CFLAGS_$(AMDDALPATH)/dc/dml2/display_mode_util.o := $(dml2_ccflags)
>   CFLAGS_$(AMDDALPATH)/dc/dml2/dml2_wrapper.o := $(dml2_ccflags)
>   CFLAGS_$(AMDDALPATH)/dc/dml2/dml2_utils.o := $(dml2_ccflags)
> 
> ---
> base-commit: cd90511557fdfb394bb4ac4c3b539b007383914c
> change-id: 20231018-amdgpu-dml2-respect-frame_warn-536e19b69ce0
> 
> Best regards,
diff mbox series

Patch

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/Makefile b/drivers/gpu/drm/amd/display/dc/dml2/Makefile
index f35ed8de260d..66431525f2a0 100644
--- a/drivers/gpu/drm/amd/display/dc/dml2/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dml2/Makefile
@@ -61,7 +61,7 @@  ifneq ($(CONFIG_FRAME_WARN),0)
 frame_warn_flag := -Wframe-larger-than=2048
 endif
 
-CFLAGS_$(AMDDALPATH)/dc/dml2/display_mode_core.o := $(dml2_ccflags) -Wframe-larger-than=2048
+CFLAGS_$(AMDDALPATH)/dc/dml2/display_mode_core.o := $(dml2_ccflags) $(frame_warn_flag)
 CFLAGS_$(AMDDALPATH)/dc/dml2/display_mode_util.o := $(dml2_ccflags)
 CFLAGS_$(AMDDALPATH)/dc/dml2/dml2_wrapper.o := $(dml2_ccflags)
 CFLAGS_$(AMDDALPATH)/dc/dml2/dml2_utils.o := $(dml2_ccflags)