tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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.

Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Ao Zhong <hacc1225@gmail.com>
Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Ao Zhong and committed by
Alex Deucher 79b72db6 ec4927d4

+24 -5
+2 -1
drivers/gpu/drm/amd/display/Kconfig
··· 6 6 bool "AMD DC - Enable new display engine" 7 7 default y 8 8 select SND_HDA_COMPONENT if SND_HDA_CORE 9 - select DRM_AMD_DC_DCN if (X86 || PPC_LONG_DOUBLE_128) 9 + # !CC_IS_CLANG: https://github.com/ClangBuiltLinux/linux/issues/1752 10 + select DRM_AMD_DC_DCN if (X86 || PPC_LONG_DOUBLE_128 || (ARM64 && KERNEL_MODE_NEON && !CC_IS_CLANG)) 10 11 help 11 12 Choose this option if you want to use the new display engine 12 13 support for AMDGPU. This adds required support for Vega and
+6
drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c
··· 31 31 #elif defined(CONFIG_PPC64) 32 32 #include <asm/switch_to.h> 33 33 #include <asm/cputable.h> 34 + #elif defined(CONFIG_ARM64) 35 + #include <asm/neon.h> 34 36 #endif 35 37 36 38 /** ··· 101 99 preempt_disable(); 102 100 enable_kernel_fp(); 103 101 } 102 + #elif defined(CONFIG_ARM64) 103 + kernel_neon_begin(); 104 104 #endif 105 105 } 106 106 ··· 140 136 disable_kernel_fp(); 141 137 preempt_enable(); 142 138 } 139 + #elif defined(CONFIG_ARM64) 140 + kernel_neon_end(); 143 141 #endif 144 142 } 145 143
+16 -4
drivers/gpu/drm/amd/display/dc/dml/Makefile
··· 33 33 dml_ccflags := -mhard-float -maltivec 34 34 endif 35 35 36 + ifdef CONFIG_ARM64 37 + dml_rcflags := -mgeneral-regs-only 38 + endif 39 + 36 40 ifdef CONFIG_CC_IS_GCC 37 41 ifneq ($(call gcc-min-version, 70100),y) 38 42 IS_OLD_GCC = 1 ··· 59 55 endif 60 56 61 57 CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_ccflags) 62 - 63 - ifdef CONFIG_DRM_AMD_DC_DCN 64 58 CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_ccflags) 65 59 CFLAGS_$(AMDDALPATH)/dc/dml/dcn10/dcn10_fpu.o := $(dml_ccflags) 66 60 CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/dcn20_fpu.o := $(dml_ccflags) ··· 90 88 CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_auto.o := $(dml_ccflags) 91 89 CFLAGS_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_math.o := $(dml_ccflags) -Wno-tautological-compare 92 90 CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_rcflags) 93 - CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn2x/dcn2x.o := $(dml_rcflags) 94 91 CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20.o := $(dml_rcflags) 95 92 CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20.o := $(dml_rcflags) 96 93 CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20v2.o := $(dml_rcflags) ··· 106 105 CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn301/dcn301_fpu.o := $(dml_rcflags) 107 106 CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_rcflags) 108 107 CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dsc/rc_calc_fpu.o := $(dml_rcflags) 109 - endif 108 + CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn10/dcn10_fpu.o := $(dml_rcflags) 109 + CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/dcn20_fpu.o := $(dml_rcflags) 110 + CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/display_mode_vba_314.o := $(dml_rcflags) 111 + CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/display_rq_dlg_calc_314.o := $(dml_rcflags) 112 + CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/dcn314_fpu.o := $(dml_rcflags) 113 + CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn30/dcn30_fpu.o := $(dml_rcflags) 114 + CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/dcn32_fpu.o := $(dml_rcflags) 115 + CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn321/dcn321_fpu.o := $(dml_rcflags) 116 + CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn31/dcn31_fpu.o := $(dml_rcflags) 117 + CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn302/dcn302_fpu.o := $(dml_rcflags) 118 + CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn303/dcn303_fpu.o := $(dml_rcflags) 119 + CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_math.o := $(dml_rcflags) 110 120 CFLAGS_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_ccflags) 111 121 CFLAGS_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers.o := $(dml_ccflags) 112 122 CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_rcflags)