diff options
Diffstat (limited to 'sys/arch')
-rw-r--r-- | sys/arch/amd64/conf/Makefile.amd64 | 24 | ||||
-rw-r--r-- | sys/arch/arm64/conf/Makefile.arm64 | 12 | ||||
-rw-r--r-- | sys/arch/powerpc64/conf/Makefile.powerpc64 | 12 |
3 files changed, 33 insertions, 15 deletions
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64 index e6c6d910b19..02b3fa9fe82 100644 --- a/sys/arch/amd64/conf/Makefile.amd64 +++ b/sys/arch/amd64/conf/Makefile.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.amd64,v 1.119 2021/01/28 17:39:02 deraadt Exp $ +# $OpenBSD: Makefile.amd64,v 1.120 2021/07/07 02:38:21 jsg Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -31,9 +31,13 @@ INCLUDES= -nostdinc -I$S -I${.OBJDIR} -I$S/arch \ -I$S/dev/pci/drm/amd/display/include \ -I$S/dev/pci/drm/amd/display/dc \ -I$S/dev/pci/drm/amd/display/amdgpu_dm \ - -I$S/dev/pci/drm/amd/powerplay/inc \ - -I$S/dev/pci/drm/amd/powerplay/smumgr \ - -I$S/dev/pci/drm/amd/powerplay/hwmgr \ + -I$S/dev/pci/drm/amd/pm/inc \ + -I$S/dev/pci/drm/amd/pm/swsmu \ + -I$S/dev/pci/drm/amd/pm/swsmu/smu11 \ + -I$S/dev/pci/drm/amd/pm/swsmu/smu12 \ + -I$S/dev/pci/drm/amd/pm/powerplay \ + -I$S/dev/pci/drm/amd/pm/powerplay/hwmgr \ + -I$S/dev/pci/drm/amd/pm/powerplay/smumgr \ -I$S/dev/pci/drm/amd/display/dc/inc \ -I$S/dev/pci/drm/amd/display/dc/inc/hw \ -I$S/dev/pci/drm/amd/display/dc/clk_mgr \ @@ -41,7 +45,7 @@ INCLUDES= -nostdinc -I$S -I${.OBJDIR} -I$S/arch \ -I$S/dev/pci/drm/amd/display/modules/hdcp \ -I$S/dev/pci/drm/amd/display/dmub/inc \ -I$S/dev/pci/drm/i915 -CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -MD -MP +CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -MD -MP -DCONFIG_DRM_AMD_DC_DCN3_0 CWARNFLAGS= -Werror -Wall -Wimplicit-function-declaration \ -Wno-uninitialized -Wno-pointer-sign \ -Wframe-larger-than=2047 @@ -196,6 +200,10 @@ display_rq_dlg_calc_20.o: $S/dev/pci/drm/amd/display/dc/dml/dcn20/display_rq_dlg ${NORMAL_C} ${HARDFLOAT_CFLAGS} display_mode_vba_20v2.o: $S/dev/pci/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c ${NORMAL_C} ${HARDFLOAT_CFLAGS} +display_mode_vba_30.o: $S/dev/pci/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c + ${NORMAL_C} ${HARDFLOAT_CFLAGS} +display_rq_dlg_calc_30.o: $S/dev/pci/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c + ${NORMAL_C} ${HARDFLOAT_CFLAGS} display_rq_dlg_calc_20v2.o: $S/dev/pci/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c ${NORMAL_C} ${HARDFLOAT_CFLAGS} display_mode_vba_21.o: $S/dev/pci/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c @@ -206,8 +214,6 @@ dml1_display_rq_dlg_calc.o: $S/dev/pci/drm/amd/display/dc/dml/dml1_display_rq_dl ${NORMAL_C} ${HARDFLOAT_CFLAGS} display_rq_dlg_helpers.o: $S/dev/pci/drm/amd/display/dc/dml/display_rq_dlg_helpers.c ${NORMAL_C} ${HARDFLOAT_CFLAGS} -dml_common_defs.o: $S/dev/pci/drm/amd/display/dc/dml/dml_common_defs.c - ${NORMAL_C} ${HARDFLOAT_CFLAGS} dcn20_resource.o: $S/dev/pci/drm/amd/display/dc/dcn20/dcn20_resource.c ${NORMAL_C} ${HARDFLOAT_CFLAGS} dcn21_resource.o: $S/dev/pci/drm/amd/display/dc/dcn21/dcn21_resource.c @@ -218,6 +224,10 @@ rc_calc.o: $S/dev/pci/drm/amd/display/dc/dsc/rc_calc.c ${NORMAL_C} ${HARDFLOAT_CFLAGS} rc_calc_dpi.o: $S/dev/pci/drm/amd/display/dc/dsc/rc_calc_dpi.c ${NORMAL_C} ${HARDFLOAT_CFLAGS} +dcn30_resource.o: $S/dev/pci/drm/amd/display/dc/dcn30/dcn30_resource.c + ${NORMAL_C} ${HARDFLOAT_CFLAGS} +dcn30_optc.o: $S/dev/pci/drm/amd/display/dc/dcn30/dcn30_optc.c + ${NORMAL_C} ${HARDFLOAT_CFLAGS} clean: rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* \ diff --git a/sys/arch/arm64/conf/Makefile.arm64 b/sys/arch/arm64/conf/Makefile.arm64 index 1f34c3c02de..0eb8e2e206e 100644 --- a/sys/arch/arm64/conf/Makefile.arm64 +++ b/sys/arch/arm64/conf/Makefile.arm64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.arm64,v 1.38 2021/05/16 02:01:33 jsg Exp $ +# $OpenBSD: Makefile.arm64,v 1.39 2021/07/07 02:38:21 jsg Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -31,9 +31,13 @@ INCLUDES= -nostdinc -I$S -I${.OBJDIR} -I$S/arch \ -I$S/dev/pci/drm/amd/display/include \ -I$S/dev/pci/drm/amd/display/dc \ -I$S/dev/pci/drm/amd/display/amdgpu_dm \ - -I$S/dev/pci/drm/amd/powerplay/inc \ - -I$S/dev/pci/drm/amd/powerplay/smumgr \ - -I$S/dev/pci/drm/amd/powerplay/hwmgr \ + -I$S/dev/pci/drm/amd/pm/inc \ + -I$S/dev/pci/drm/amd/pm/swsmu \ + -I$S/dev/pci/drm/amd/pm/swsmu/smu11 \ + -I$S/dev/pci/drm/amd/pm/swsmu/smu12 \ + -I$S/dev/pci/drm/amd/pm/powerplay \ + -I$S/dev/pci/drm/amd/pm/powerplay/hwmgr \ + -I$S/dev/pci/drm/amd/pm/powerplay/smumgr \ -I$S/dev/pci/drm/amd/display/dc/inc \ -I$S/dev/pci/drm/amd/display/dc/inc/hw \ -I$S/dev/pci/drm/amd/display/dc/clk_mgr \ diff --git a/sys/arch/powerpc64/conf/Makefile.powerpc64 b/sys/arch/powerpc64/conf/Makefile.powerpc64 index d8143dff423..d8489d804cf 100644 --- a/sys/arch/powerpc64/conf/Makefile.powerpc64 +++ b/sys/arch/powerpc64/conf/Makefile.powerpc64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.powerpc64,v 1.9 2021/01/28 17:39:03 deraadt Exp $ +# $OpenBSD: Makefile.powerpc64,v 1.10 2021/07/07 02:38:21 jsg Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -31,9 +31,13 @@ INCLUDES= -nostdinc -I$S -I${.OBJDIR} -I$S/arch \ -I$S/dev/pci/drm/amd/display/include \ -I$S/dev/pci/drm/amd/display/dc \ -I$S/dev/pci/drm/amd/display/amdgpu_dm \ - -I$S/dev/pci/drm/amd/powerplay/inc \ - -I$S/dev/pci/drm/amd/powerplay/smumgr \ - -I$S/dev/pci/drm/amd/powerplay/hwmgr \ + -I$S/dev/pci/drm/amd/pm/inc \ + -I$S/dev/pci/drm/amd/pm/swsmu \ + -I$S/dev/pci/drm/amd/pm/swsmu/smu11 \ + -I$S/dev/pci/drm/amd/pm/swsmu/smu12 \ + -I$S/dev/pci/drm/amd/pm/powerplay \ + -I$S/dev/pci/drm/amd/pm/powerplay/hwmgr \ + -I$S/dev/pci/drm/amd/pm/powerplay/smumgr \ -I$S/dev/pci/drm/amd/display/dc/inc \ -I$S/dev/pci/drm/amd/display/dc/inc/hw \ -I$S/dev/pci/drm/amd/display/dc/clk_mgr \ |