Skip to contentSkip to conversation

drm/amd/display: add DCN support for ARM64

PATCH In review Ao Zhong 3 participants 6 messages Oct 31, 2022 – Nov 3, 2022

Subsystems (4)
lore
Share & tools
lore

Ao Zhong

author
#0 lore raw

v4 cover drm/amd/display: add DCN support for ARM64

Hello everyone,

Recently I got a SBSA ARM64 workstation, and try to use it as my daily drive machine after installing an AMD RX6400 graphics card.

Since the newer AMD GPUs require DCN (Display Core Next) support to work properly, DCN is not supported on ARM64 platforms. Because some code in DCN needs to use FPU, and aarch64 has no soft floating-point toolchain.

Displaycore developers have started isolating code that needs to use FPU, and most of the code has been isolated. In the process of trying to enable DCN support for the ARM64 platform, I found that there are two remaining code blocks that are not isolated. Due to -mgeneral-regs-only is enabled by default to compile the kernel on the ARM64 platform, these two code blocks will cause the compilation to fail after enabling DCN support.

I have submitted two patches to isolate the remaining two code blocks that need to use the FPU.
Links: https://patchwork.freedesktop.org/patch/508813/
Links: https://patchwork.freedesktop.org/patch/508816/
After merging these two patches, we can enable DCN support for ARM64 platform.

I removed -mgeneral-regs-only CFLAG in the dml/Makefile for the code that needs to use hardware FPU, and add a control mechanism in amdgpu_dm/dc_fpu.c for ARM Neon.

Change Since V3:
- Check if CC_IS_CLANG is disabled, since current DCN build with clang on ARM64 is broken

Change Since V2:
- Drop CONFIG_DRM_AMD_DC_DCN check when initializing the dml_rcflags for ARM64
- Drop CONFIG_ARM64 and CONFIG_DRM_AMD_DC_DCN check for the per-file cflags list entirely

Change Since V1:
- replace $(dml_rcflags_arm64) with $(dml_rcflags) in dml/Makefile

Ao Zhong (1):
drm/amd/display: add DCN support for ARM64

 drivers/gpu/drm/amd/display/Kconfig           |  3 ++-
 .../gpu/drm/amd/display/amdgpu_dm/dc_fpu.c    |  6 ++++++
 drivers/gpu/drm/amd/display/dc/dml/Makefile   | 20 +++++++++++++++----
 3 files changed, 24 insertions(+), 5 deletions(-)
Signature · 1 line
2.37.4
author
#1 lore raw

PATCH v4 1/1 drm/amd/display: add DCN support for ARM64

After moving all FPU code to the DML folder, we can enable DCN support for the ARM64 platform. Remove the -mgeneral-regs-only CFLAG from the code in the DML folder that needs to use hardware FPU, and add a control mechanism for ARM Neon.

---
 drivers/gpu/drm/amd/display/Kconfig           |  3 ++-
 .../gpu/drm/amd/display/amdgpu_dm/dc_fpu.c    |  6 ++++++
 drivers/gpu/drm/amd/display/dc/dml/Makefile   | 20 +++++++++++++++----
 3 files changed, 24 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/Kconfig +2 -1
index 0142affcdaa3..843a55a6a3ac 100644
@@ -6,7 +6,8 @@ config DRM_AMD_DC
 	bool "AMD DC - Enable new display engine"
 	default y
 	select SND_HDA_COMPONENT if SND_HDA_CORE
-	select DRM_AMD_DC_DCN if (X86 || PPC64)
+	# !CC_IS_CLANG: https://github.com/ClangBuiltLinux/linux/issues/1752
+	select DRM_AMD_DC_DCN if (X86 || PPC64 || (ARM64 && KERNEL_MODE_NEON && !CC_IS_CLANG))
 	help
 	  Choose this option if you want to use the new display engine
 	  support for AMDGPU. This adds required support for Vega and
drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c +6 -0
index ab0c6d191038..1743ca0a3641 100644
@@ -31,6 +31,8 @@
 #elif defined(CONFIG_PPC64)
 #include <asm/switch_to.h>
 #include <asm/cputable.h>
+#elif defined(CONFIG_ARM64)
+#include <asm/neon.h>
 #endif
 
 /**
@@ -99,6 +101,8 @@ void dc_fpu_begin(const char *function_name, const int line)
 			preempt_disable();
 			enable_kernel_fp();
 		}
+#elif defined(CONFIG_ARM64)
+		kernel_neon_begin();
 #endif
 	}
 
@@ -136,6 +140,8 @@ void dc_fpu_end(const char *function_name, const int line)
 			disable_kernel_fp();
 			preempt_enable();
 		}
+#elif defined(CONFIG_ARM64)
+		kernel_neon_end();
 #endif
 	}
 
drivers/gpu/drm/amd/display/dc/dml/Makefile +16 -4
index d0c6cf61c676..d4e93bed1c8e 100644
@@ -33,6 +33,10 @@ ifdef CONFIG_PPC64
 dml_ccflags := -mhard-float -maltivec
 endif
 
+ifdef CONFIG_ARM64
+dml_rcflags := -mgeneral-regs-only
+endif
+
 ifdef CONFIG_CC_IS_GCC
 ifeq ($(call cc-ifversion, -lt, 0701, y), y)
 IS_OLD_GCC = 1
@@ -55,8 +59,6 @@ frame_warn_flag := -Wframe-larger-than=2048
 endif
 
 CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_ccflags)
-
-ifdef CONFIG_DRM_AMD_DC_DCN
 CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_ccflags)
 CFLAGS_$(AMDDALPATH)/dc/dml/dcn10/dcn10_fpu.o := $(dml_ccflags)
 CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/dcn20_fpu.o := $(dml_ccflags)
@@ -88,7 +90,6 @@ CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calcs.o := $(dml_ccflags)
 CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_auto.o := $(dml_ccflags)
 CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_math.o := $(dml_ccflags) -Wno-tautological-compare
 CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_rcflags)
-CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn2x/dcn2x.o := $(dml_rcflags)
 CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20.o := $(dml_rcflags)
 CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20.o := $(dml_rcflags)
 CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20v2.o := $(dml_rcflags)
@@ -105,7 +106,18 @@ CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/display_mode_vba_util_32.o := $(dml_rcf
 CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn301/dcn301_fpu.o := $(dml_rcflags)
 CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_rcflags)
 CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dsc/rc_calc_fpu.o  := $(dml_rcflags)
-endif
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn10/dcn10_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/dcn20_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/display_mode_vba_314.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/display_rq_dlg_calc_314.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/dcn314_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn30/dcn30_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/dcn32_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn321/dcn321_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn31/dcn31_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn302/dcn302_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn303/dcn303_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_math.o := $(dml_rcflags)
 CFLAGS_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_ccflags)
 CFLAGS_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers.o := $(dml_ccflags)
 CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_rcflags)
Signature · 1 line
2.37.4
Reviewed-by on v4 1/1
#2 lore raw
Quoted 99 lines · Ao Zhong

After moving all FPU code to the DML folder, we can enable DCN support for the ARM64 platform. Remove the -mgeneral-regs-only CFLAG from the code in the DML folder that needs to use hardware FPU, and add a control mechanism for ARM Neon.

---
  drivers/gpu/drm/amd/display/Kconfig           |  3 ++-
  .../gpu/drm/amd/display/amdgpu_dm/dc_fpu.c    |  6 ++++++
  drivers/gpu/drm/amd/display/dc/dml/Makefile   | 20 +++++++++++++++----
  3 files changed, 24 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/Kconfig +2 -1
index 0142affcdaa3..843a55a6a3ac 100644
@@ -6,7 +6,8 @@ config DRM_AMD_DC
  	bool "AMD DC - Enable new display engine"
  	default y
  	select SND_HDA_COMPONENT if SND_HDA_CORE
-	select DRM_AMD_DC_DCN if (X86 || PPC64)
+	# !CC_IS_CLANG: https://github.com/ClangBuiltLinux/linux/issues/1752
+	select DRM_AMD_DC_DCN if (X86 || PPC64 || (ARM64 && KERNEL_MODE_NEON && !CC_IS_CLANG))
  	help
  	  Choose this option if you want to use the new display engine
  	  support for AMDGPU. This adds required support for Vega and
drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c +6 -0
index ab0c6d191038..1743ca0a3641 100644
@@ -31,6 +31,8 @@
  #elif defined(CONFIG_PPC64)
  #include <asm/switch_to.h>
  #include <asm/cputable.h>
+#elif defined(CONFIG_ARM64)
+#include <asm/neon.h>
  #endif
 
  /**
@@ -99,6 +101,8 @@ void dc_fpu_begin(const char *function_name, const int line)
  			preempt_disable();
  			enable_kernel_fp();
  		}
+#elif defined(CONFIG_ARM64)
+		kernel_neon_begin();
  #endif
  	}
 
@@ -136,6 +140,8 @@ void dc_fpu_end(const char *function_name, const int line)
  			disable_kernel_fp();
  			preempt_enable();
  		}
+#elif defined(CONFIG_ARM64)
+		kernel_neon_end();
  #endif
  	}
 
drivers/gpu/drm/amd/display/dc/dml/Makefile +9 -4
index d0c6cf61c676..d4e93bed1c8e 100644
@@ -33,6 +33,10 @@ ifdef CONFIG_PPC64
  dml_ccflags := -mhard-float -maltivec
  endif
 
+ifdef CONFIG_ARM64
+dml_rcflags := -mgeneral-regs-only
+endif
+
  ifdef CONFIG_CC_IS_GCC
  ifeq ($(call cc-ifversion, -lt, 0701, y), y)
  IS_OLD_GCC = 1
@@ -55,8 +59,6 @@ frame_warn_flag := -Wframe-larger-than=2048
  endif
 
  CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_ccflags)
-
-ifdef CONFIG_DRM_AMD_DC_DCN
  CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_ccflags)
  CFLAGS_$(AMDDALPATH)/dc/dml/dcn10/dcn10_fpu.o := $(dml_ccflags)
  CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/dcn20_fpu.o := $(dml_ccflags)
@@ -88,7 +90,6 @@ CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calcs.o := $(dml_ccflags)
  CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_auto.o := $(dml_ccflags)
  CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_math.o := $(dml_ccflags) -Wno-tautological-compare
  CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_rcflags)
-CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn2x/dcn2x.o := $(dml_rcflags)
  CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20.o := $(dml_rcflags)
  CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20.o := $(dml_rcflags)
  CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20v2.o := $(dml_rcflags)
@@ -105,7 +106,18 @@ CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/display_mode_vba_util_32.o := $(dml_rcf
  CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn301/dcn301_fpu.o := $(dml_rcflags)
  CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_rcflags)
  CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dsc/rc_calc_fpu.o  := $(dml_rcflags)
-endif
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn10/dcn10_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/dcn20_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/display_mode_vba_314.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/display_rq_dlg_calc_314.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/dcn314_fpu.o := $(dml_rcflags)

drivers/gpu/drm/amd/display/dc/dml/Makefile CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/display_mode_vba_util_32.o := $(dml_rcf · line 123

Quoted 10 lines
drivers/gpu/drm/amd/display/dc/dml/Makefile +7 -0
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn30/dcn30_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/dcn32_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn321/dcn321_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn31/dcn31_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn302/dcn302_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn303/dcn303_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_math.o := $(dml_rcflags)
  CFLAGS_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_ccflags)
  CFLAGS_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers.o := $(dml_ccflags)
  CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_rcflags)

lgtm,

Nathan,

If it is ok for you, I can merge this change.

Thanks
Siqueira

#3 lore raw
Quoted 110 lines · Rodrigo Siqueira Jordao
Quoted 94 lines · Ao Zhong

After moving all FPU code to the DML folder, we can enable DCN support for the ARM64 platform. Remove the -mgeneral-regs-only CFLAG from the code in the DML folder that needs to use hardware FPU, and add a control mechanism for ARM Neon.

---
  drivers/gpu/drm/amd/display/Kconfig           |  3 ++-
  .../gpu/drm/amd/display/amdgpu_dm/dc_fpu.c    |  6 ++++++
  drivers/gpu/drm/amd/display/dc/dml/Makefile   | 20 +++++++++++++++----
  3 files changed, 24 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/Kconfig +2 -1
index 0142affcdaa3..843a55a6a3ac 100644
@@ -6,7 +6,8 @@ config DRM_AMD_DC
  	bool "AMD DC - Enable new display engine"
  	default y
  	select SND_HDA_COMPONENT if SND_HDA_CORE
-	select DRM_AMD_DC_DCN if (X86 || PPC64)
+	# !CC_IS_CLANG: https://github.com/ClangBuiltLinux/linux/issues/1752
+	select DRM_AMD_DC_DCN if (X86 || PPC64 || (ARM64 && KERNEL_MODE_NEON && !CC_IS_CLANG))
  	help
  	  Choose this option if you want to use the new display engine
  	  support for AMDGPU. This adds required support for Vega and
drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c +6 -0
index ab0c6d191038..1743ca0a3641 100644
@@ -31,6 +31,8 @@
  #elif defined(CONFIG_PPC64)
  #include <asm/switch_to.h>
  #include <asm/cputable.h>
+#elif defined(CONFIG_ARM64)
+#include <asm/neon.h>
  #endif
  /**
@@ -99,6 +101,8 @@ void dc_fpu_begin(const char *function_name, const int line)
  			preempt_disable();
  			enable_kernel_fp();
  		}
+#elif defined(CONFIG_ARM64)
+		kernel_neon_begin();
  #endif
  	}
@@ -136,6 +140,8 @@ void dc_fpu_end(const char *function_name, const int line)
  			disable_kernel_fp();
  			preempt_enable();
  		}
+#elif defined(CONFIG_ARM64)
+		kernel_neon_end();
  #endif
  	}
drivers/gpu/drm/amd/display/dc/dml/Makefile +9 -4
index d0c6cf61c676..d4e93bed1c8e 100644
@@ -33,6 +33,10 @@ ifdef CONFIG_PPC64
  dml_ccflags := -mhard-float -maltivec
  endif
+ifdef CONFIG_ARM64
+dml_rcflags := -mgeneral-regs-only
+endif
+
  ifdef CONFIG_CC_IS_GCC
  ifeq ($(call cc-ifversion, -lt, 0701, y), y)
  IS_OLD_GCC = 1
@@ -55,8 +59,6 @@ frame_warn_flag := -Wframe-larger-than=2048
  endif
  CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_ccflags)
-
-ifdef CONFIG_DRM_AMD_DC_DCN
  CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_ccflags)
  CFLAGS_$(AMDDALPATH)/dc/dml/dcn10/dcn10_fpu.o := $(dml_ccflags)
  CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/dcn20_fpu.o := $(dml_ccflags)
@@ -88,7 +90,6 @@ CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calcs.o := $(dml_ccflags)
  CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_auto.o := $(dml_ccflags)
  CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_math.o := $(dml_ccflags) -Wno-tautological-compare
  CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_rcflags)
-CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn2x/dcn2x.o := $(dml_rcflags)
  CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20.o := $(dml_rcflags)
  CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20.o := $(dml_rcflags)
  CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20v2.o := $(dml_rcflags)
@@ -105,7 +106,18 @@ CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/display_mode_vba_util_32.o := $(dml_rcf
  CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn301/dcn301_fpu.o := $(dml_rcflags)
  CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_rcflags)
  CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dsc/rc_calc_fpu.o  := $(dml_rcflags)
-endif
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn10/dcn10_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/dcn20_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/display_mode_vba_314.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/display_rq_dlg_calc_314.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/dcn314_fpu.o := $(dml_rcflags)

drivers/gpu/drm/amd/display/dc/dml/Makefile CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/display_mode_vba_util_32.o := $(dml_rcf · line 123

Quoted 10 lines
drivers/gpu/drm/amd/display/dc/dml/Makefile +7 -0
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn30/dcn30_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/dcn32_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn321/dcn321_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn31/dcn31_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn302/dcn302_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn303/dcn303_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_math.o := $(dml_rcflags)
  CFLAGS_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_ccflags)
  CFLAGS_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers.o := $(dml_ccflags)
  CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_rcflags)

lgtm,

Quoted 5 lines

Nathan,

If it is ok for you, I can merge this change.

Yes, this version looks good to me, as the code can no longer be built for arm64 when using clang.

Cheers,
Nathan

#4 lore raw
Quoted 114 lines · Nathan Chancellor
Quoted 113 lines · Rodrigo Siqueira Jordao
Quoted 93 lines · Ao Zhong

After moving all FPU code to the DML folder, we can enable DCN support for the ARM64 platform. Remove the -mgeneral-regs-only CFLAG from the code in the DML folder that needs to use hardware FPU, and add a control mechanism for ARM Neon.

---
   drivers/gpu/drm/amd/display/Kconfig           |  3 ++-
   .../gpu/drm/amd/display/amdgpu_dm/dc_fpu.c    |  6 ++++++
   drivers/gpu/drm/amd/display/dc/dml/Makefile   | 20 +++++++++++++++----
   3 files changed, 24 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/Kconfig +1 -1
index 0142affcdaa3..843a55a6a3ac 100644
@@ -6,7 +6,8 @@ config DRM_AMD_DC
   	bool "AMD DC - Enable new display engine"
   	default y
   	select SND_HDA_COMPONENT if SND_HDA_CORE
-	select DRM_AMD_DC_DCN if (X86 || PPC64)
+	# !CC_IS_CLANG: https://github.com/ClangBuiltLinux/linux/issues/1752>>>> +	select DRM_AMD_DC_DCN if (X86 || PPC64 || (ARM64 && KERNEL_MODE_NEON && !CC_IS_CLANG))
   	help
   	  Choose this option if you want to use the new display engine
   	  support for AMDGPU. This adds required support for Vega and
drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c +6 -0
index ab0c6d191038..1743ca0a3641 100644
@@ -31,6 +31,8 @@
   #elif defined(CONFIG_PPC64)
   #include <asm/switch_to.h>
   #include <asm/cputable.h>
+#elif defined(CONFIG_ARM64)
+#include <asm/neon.h>
   #endif
   /**
@@ -99,6 +101,8 @@ void dc_fpu_begin(const char *function_name, const int line)
   			preempt_disable();
   			enable_kernel_fp();
   		}
+#elif defined(CONFIG_ARM64)
+		kernel_neon_begin();
   #endif
   	}
@@ -136,6 +140,8 @@ void dc_fpu_end(const char *function_name, const int line)
   			disable_kernel_fp();
   			preempt_enable();
   		}
+#elif defined(CONFIG_ARM64)
+		kernel_neon_end();
   #endif
   	}
drivers/gpu/drm/amd/display/dc/dml/Makefile +9 -4
index d0c6cf61c676..d4e93bed1c8e 100644
@@ -33,6 +33,10 @@ ifdef CONFIG_PPC64
   dml_ccflags := -mhard-float -maltivec
   endif
+ifdef CONFIG_ARM64
+dml_rcflags := -mgeneral-regs-only
+endif
+
   ifdef CONFIG_CC_IS_GCC
   ifeq ($(call cc-ifversion, -lt, 0701, y), y)
   IS_OLD_GCC = 1
@@ -55,8 +59,6 @@ frame_warn_flag := -Wframe-larger-than=2048
   endif
   CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_ccflags)
-
-ifdef CONFIG_DRM_AMD_DC_DCN
   CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_ccflags)
   CFLAGS_$(AMDDALPATH)/dc/dml/dcn10/dcn10_fpu.o := $(dml_ccflags)
   CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/dcn20_fpu.o := $(dml_ccflags)
@@ -88,7 +90,6 @@ CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calcs.o := $(dml_ccflags)
   CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_auto.o := $(dml_ccflags)
   CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_math.o := $(dml_ccflags) -Wno-tautological-compare
   CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_rcflags)
-CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn2x/dcn2x.o := $(dml_rcflags)
   CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20.o := $(dml_rcflags)
   CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20.o := $(dml_rcflags)
   CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20v2.o := $(dml_rcflags)
@@ -105,7 +106,18 @@ CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/display_mode_vba_util_32.o := $(dml_rcf
   CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn301/dcn301_fpu.o := $(dml_rcflags)
   CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_rcflags)
   CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dsc/rc_calc_fpu.o  := $(dml_rcflags)
-endif
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn10/dcn10_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/dcn20_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/display_mode_vba_314.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/display_rq_dlg_calc_314.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/dcn314_fpu.o := $(dml_rcflags)

drivers/gpu/drm/amd/display/dc/dml/Makefile CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/display_mode_vba_util_32.o := $(dml_rcf · line 123

Quoted 10 lines
drivers/gpu/drm/amd/display/dc/dml/Makefile +7 -0
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn30/dcn30_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/dcn32_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn321/dcn321_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn31/dcn31_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn302/dcn302_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn303/dcn303_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_math.o := $(dml_rcflags)
   CFLAGS_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_ccflags)
   CFLAGS_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers.o := $(dml_ccflags)
   CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_rcflags)

lgtm,

Nathan,

Quoted 7 lines
Quoted 1 line

If it is ok for you, I can merge this change.

Yes, this version looks good to me, as the code can no longer be built for arm64 when using clang.

Cheers,
Nathan

I just merged this patch to amd-staging-drm-next.

Thanks
Siqueira

author
#5 lore raw

Awesome, thanks!

Rodrigo Siqueira Jordao <[email protected]> schrieb am Do. 3. Nov. 2022 um 15:21:

Quoted 161 lines · Nathan Chancellor
Quoted 7 lines · Rodrigo Siqueira Jordao
Quoted 6 lines · Ao Zhong
Quoted 3 lines

After moving all FPU code to the DML folder, we can enable DCN support for the ARM64 platform. Remove the -mgeneral-regs-only CFLAG from the code in the DML folder that needs to use hardware FPU, and add a

control

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

mechanism for ARM Neon.

---
   drivers/gpu/drm/amd/display/Kconfig           |  3 ++-
   .../gpu/drm/amd/display/amdgpu_dm/dc_fpu.c    |  6 ++++++
   drivers/gpu/drm/amd/display/dc/dml/Makefile   | 20

+++++++++++++++----

Quoted 3 lines
Quoted 3 lines

Review

Quoted 3 lines
   3 files changed, 24 insertions(+), 5 deletions(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/amd/display/Kconfig

Quoted 9 lines
Quoted 9 lines

drivers/gpu/drm/amd/display/Kconfig config DRM_AMD_DC · line 9

Quoted 9 lines

index 0142affcdaa3..843a55a6a3ac 100644

drivers/gpu/drm/amd/display/Kconfig +1 -1
@@ -6,7 +6,8 @@ config DRM_AMD_DC
    bool "AMD DC - Enable new display engine"
    default y
    select SND_HDA_COMPONENT if SND_HDA_CORE
-   select DRM_AMD_DC_DCN if (X86 || PPC64)
+   # !CC_IS_CLANG:

https://github.com/ClangBuiltLinux/linux/issues/1752>>>> + select
DRM_AMD_DC_DCN if (X86 || PPC64 || (ARM64 && KERNEL_MODE_NEON && !CC_IS_CLANG))

Quoted 4 lines
Quoted 4 lines

Review

Quoted 4 lines
drivers/gpu/drm/amd/display/Kconfig +0 -0
    help
      Choose this option if you want to use the new display engine
      support for AMDGPU. This adds required support for Vega and
(quoted diff) +0 -0

b/drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

index ab0c6d191038..1743ca0a3641 100644

drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c +0 -0
@@ -31,6 +31,8 @@
Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c void dc_fpu_begin(const char *function_name, const

Quoted 8 lines
drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c +2 -0
   #elif defined(CONFIG_PPC64)
   #include <asm/switch_to.h>
   #include <asm/cputable.h>
+#elif defined(CONFIG_ARM64)
+#include <asm/neon.h>
   #endif
   /**
@@ -99,6 +101,8 @@ void dc_fpu_begin(const char *function_name, const

int line)

Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c void dc_fpu_end(const char *function_name, const

Quoted 8 lines
drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c +2 -0
                    preempt_disable();
                    enable_kernel_fp();
            }
+#elif defined(CONFIG_ARM64)
+           kernel_neon_begin();
   #endif
    }
@@ -136,6 +140,8 @@ void dc_fpu_end(const char *function_name, const

int line)

Quoted 8 lines
Quoted 8 lines

Review

Quoted 8 lines
drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c +2 -0
                    disable_kernel_fp();
                    preempt_enable();
            }
+#elif defined(CONFIG_ARM64)
+           kernel_neon_end();
   #endif
    }
(quoted diff) +0 -0

b/drivers/gpu/drm/amd/display/dc/dml/Makefile

Quoted 14 lines
Quoted 14 lines
Quoted 14 lines

index d0c6cf61c676..d4e93bed1c8e 100644

drivers/gpu/drm/amd/display/dc/dml/Makefile +4 -0
@@ -33,6 +33,10 @@ ifdef CONFIG_PPC64
   dml_ccflags := -mhard-float -maltivec
   endif
+ifdef CONFIG_ARM64
+dml_rcflags := -mgeneral-regs-only
+endif
+
   ifdef CONFIG_CC_IS_GCC
   ifeq ($(call cc-ifversion, -lt, 0701, y), y)
   IS_OLD_GCC = 1
@@ -55,8 +59,6 @@ frame_warn_flag := -Wframe-larger-than=2048
Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/amd/display/dc/dml/Makefile CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calcs.o :=

Quoted 8 lines
drivers/gpu/drm/amd/display/dc/dml/Makefile +0 -2
   endif
   CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_ccflags)
-
-ifdef CONFIG_DRM_AMD_DC_DCN
   CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_ccflags)
   CFLAGS_$(AMDDALPATH)/dc/dml/dcn10/dcn10_fpu.o := $(dml_ccflags)
   CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/dcn20_fpu.o := $(dml_ccflags)
@@ -88,7 +90,6 @@ CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calcs.o :=

$(dml_ccflags)

Quoted 2 lines
Quoted 2 lines

drivers/gpu/drm/amd/display/dc/dml/Makefile CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calcs.o := · line 91

Quoted 2 lines
drivers/gpu/drm/amd/display/dc/dml/Makefile +0 -0
   CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_auto.o := $(dml_ccflags)
   CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_math.o := $(dml_ccflags)

-Wno-tautological-compare

Quoted 1 line
Quoted 1 line

drivers/gpu/drm/amd/display/dc/dml/Makefile CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calcs.o := · line 92

Quoted 1 line
drivers/gpu/drm/amd/display/dc/dml/Makefile +0 -0
   CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_vba.o :=

$(dml_rcflags)

Quoted 2 lines
Quoted 2 lines

drivers/gpu/drm/amd/display/dc/dml/Makefile CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calcs.o := · line 93

Quoted 2 lines
drivers/gpu/drm/amd/display/dc/dml/Makefile +0 -1
-CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn2x/dcn2x.o := $(dml_rcflags)
   CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20.o :=

$(dml_rcflags)

Quoted 1 line
Quoted 1 line

drivers/gpu/drm/amd/display/dc/dml/Makefile CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calcs.o := · line 94

Quoted 1 line
drivers/gpu/drm/amd/display/dc/dml/Makefile +0 -0
   CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20.o

:= $(dml_rcflags)

Quoted 1 line
Quoted 1 line

drivers/gpu/drm/amd/display/dc/dml/Makefile CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calcs.o := · line 95

Quoted 1 line
drivers/gpu/drm/amd/display/dc/dml/Makefile +0 -0
   CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20v2.o :=

$(dml_rcflags)

Quoted 1 line
Quoted 1 line

drivers/gpu/drm/amd/display/dc/dml/Makefile

Quoted 1 line
drivers/gpu/drm/amd/display/dc/dml/Makefile +0 -0
@@ -105,7 +106,18 @@

CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/display_mode_vba_util_32.o := $(dml_rcf

Quoted 1 line
Quoted 1 line

drivers/gpu/drm/amd/display/dc/dml/Makefile line 106

Quoted 1 line
drivers/gpu/drm/amd/display/dc/dml/Makefile +0 -0
   CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn301/dcn301_fpu.o :=

$(dml_rcflags)

Quoted 1 line
Quoted 1 line

drivers/gpu/drm/amd/display/dc/dml/Makefile line 107

Quoted 1 line
drivers/gpu/drm/amd/display/dc/dml/Makefile +0 -0
   CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_lib.o :=

$(dml_rcflags)

Quoted 1 line
Quoted 1 line

drivers/gpu/drm/amd/display/dc/dml/Makefile line 108

Quoted 1 line
drivers/gpu/drm/amd/display/dc/dml/Makefile +0 -0
   CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dsc/rc_calc_fpu.o  :=

$(dml_rcflags)

Quoted 4 lines
Quoted 4 lines

drivers/gpu/drm/amd/display/dc/dml/Makefile CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/display_mode_vba_util_32.o := $(dml_rcf

Quoted 4 lines
drivers/gpu/drm/amd/display/dc/dml/Makefile +3 -1
-endif
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn10/dcn10_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/dcn20_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/display_mode_vba_314.o :=

$(dml_rcflags)

Quoted 1 line
Quoted 1 line

drivers/gpu/drm/amd/display/dc/dml/Makefile line 112

Quoted 1 line
drivers/gpu/drm/amd/display/dc/dml/Makefile +1 -0
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/display_rq_dlg_calc_314.o

:= $(dml_rcflags)

Quoted 1 line
Quoted 1 line

drivers/gpu/drm/amd/display/dc/dml/Makefile line 113

Quoted 1 line
drivers/gpu/drm/amd/display/dc/dml/Makefile +1 -0
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/dcn314_fpu.o :=

$(dml_rcflags)

Quoted 3 lines
Quoted 3 lines

drivers/gpu/drm/amd/display/dc/dml/Makefile CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/display_mode_vba_util_32.o := $(dml_rcf

Quoted 3 lines
drivers/gpu/drm/amd/display/dc/dml/Makefile +3 -0
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn30/dcn30_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/dcn32_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn321/dcn321_fpu.o :=

$(dml_rcflags)

Quoted 2 lines
Quoted 2 lines

drivers/gpu/drm/amd/display/dc/dml/Makefile line 118

Quoted 2 lines
drivers/gpu/drm/amd/display/dc/dml/Makefile +2 -0
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn31/dcn31_fpu.o := $(dml_rcflags)
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn302/dcn302_fpu.o :=

$(dml_rcflags)

Quoted 1 line
Quoted 1 line

drivers/gpu/drm/amd/display/dc/dml/Makefile line 119

Quoted 1 line
drivers/gpu/drm/amd/display/dc/dml/Makefile +1 -0
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn303/dcn303_fpu.o :=

$(dml_rcflags)

Quoted 1 line
Quoted 1 line

drivers/gpu/drm/amd/display/dc/dml/Makefile line 120

Quoted 1 line
drivers/gpu/drm/amd/display/dc/dml/Makefile +1 -0
+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_math.o :=

$(dml_rcflags)

Quoted 1 line
Quoted 1 line

drivers/gpu/drm/amd/display/dc/dml/Makefile line 121

Quoted 1 line
drivers/gpu/drm/amd/display/dc/dml/Makefile +0 -0
   CFLAGS_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o :=

$(dml_ccflags)

Quoted 1 line
Quoted 1 line

drivers/gpu/drm/amd/display/dc/dml/Makefile line 122

Quoted 1 line
drivers/gpu/drm/amd/display/dc/dml/Makefile +0 -0
   CFLAGS_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers.o :=

$(dml_ccflags)

Quoted 1 line
Quoted 1 line

drivers/gpu/drm/amd/display/dc/dml/Makefile line 123

Quoted 1 line
drivers/gpu/drm/amd/display/dc/dml/Makefile +0 -0
   CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o :=

$(dml_rcflags)

Quoted 7 lines
Quoted 7 lines

lgtm,

Nathan,

Quoted 7 lines
Quoted 1 line

If it is ok for you, I can merge this change.

Yes, this version looks good to me, as the code can no longer be built for arm64 when using clang.

Cheers,
Nathan

I just merged this patch to amd-staging-drm-next.

Thanks
Siqueira