diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2022-01-14 06:53:18 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2022-01-14 06:53:18 +0000 |
| commit | 79f416d24d4bcd32a55ee368b8896e7a5d95eed4 (patch) | |
| tree | 46988055eca498f39200f52899008cc5cf2e0df5 /sys/arch | |
| parent | 02cb1c0d4a143855129aae02385ee98ba28afe7e (diff) | |
update drm to linux 5.15.14
new hardware support includes
Intel
ehl/Elkhart Lake (embedded)
jsl/Jasper Lake (atom)
rkl/Rocket Lake (desktop)
AMD
van gogh APU (gfx1033)
yellow carp / rembrandt APU (gfx1035?)
Ryzen 6000 APU
navy flounder / navi 22 (gfx1031)
RX 6700, RX 6700 XT, RX 6700M, RX 6800M, RX 6850M XT
dimgrey cavefish / navi 23 (gfx1032)
Pro W6600, Pro W6600M, RX 6600, RX 6600 XT, RX 6600M,
RX 6600S, RX 6650M, RX 6650M XT, RX 6700S, RX 6800S
beige goby / navi 24 (gfx1034)
RX 6500 XT, RX 6400, RX 6500M, RX 6300M
Thanks to the OpenBSD Foundation for sponsoring this work
niklas@ for helping with ttm and amdgpu and patrick@ for adapting
rockchip drm.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/conf/Makefile.amd64 | 14 | ||||
| -rw-r--r-- | sys/arch/arm64/conf/Makefile.arm64 | 3 | ||||
| -rw-r--r-- | sys/arch/powerpc64/conf/Makefile.powerpc64 | 3 |
3 files changed, 15 insertions, 5 deletions
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64 index 68e8aee58d9..b328d52238c 100644 --- a/sys/arch/amd64/conf/Makefile.amd64 +++ b/sys/arch/amd64/conf/Makefile.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.amd64,v 1.124 2021/12/28 16:29:59 otto Exp $ +# $OpenBSD: Makefile.amd64,v 1.125 2022/01/14 06:53:16 jsg Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -35,6 +35,7 @@ INCLUDES= -nostdinc -I$S -I${.OBJDIR} -I$S/arch \ -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/swsmu/smu13 \ -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 \ @@ -45,8 +46,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 \ - -DCONFIG_DRM_AMD_DC_DCN3_0 +CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -MD -MP CWARNFLAGS= -Werror -Wall -Wimplicit-function-declaration \ -Wno-pointer-sign \ -Wframe-larger-than=2047 @@ -197,6 +197,8 @@ dcn_calc_math.o: $S/dev/pci/drm/amd/display/dc/calcs/dcn_calc_math.c ${NORMAL_C} ${HARDFLOAT_CFLAGS} display_mode_vba.o: $S/dev/pci/drm/amd/display/dc/dml/display_mode_vba.c ${NORMAL_C} ${HARDFLOAT_CFLAGS} +dcn2x.o: $S/dev/pci/drm/amd/display/dc/dml/dcn2x/dcn2x.c + ${NORMAL_C} ${HARDFLOAT_CFLAGS} display_mode_vba_20.o: $S/dev/pci/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c ${NORMAL_C} ${HARDFLOAT_CFLAGS} display_rq_dlg_calc_20.o: $S/dev/pci/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c @@ -205,8 +207,12 @@ display_mode_vba_20v2.o: $S/dev/pci/drm/amd/display/dc/dml/dcn20/display_mode_vb ${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_mode_vba_31.o: $S/dev/pci/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.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_31.o: $S/dev/pci/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.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 @@ -221,6 +227,8 @@ 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 ${NORMAL_C} ${HARDFLOAT_CFLAGS} +dcn31_resource.o: $S/dev/pci/drm/amd/display/dc/dcn31/dcn31_resource.c + ${NORMAL_C} ${HARDFLOAT_CFLAGS} dc_dsc.o: $S/dev/pci/drm/amd/display/dc/dsc/dc_dsc.c ${NORMAL_C} ${HARDFLOAT_CFLAGS} rc_calc.o: $S/dev/pci/drm/amd/display/dc/dsc/rc_calc.c diff --git a/sys/arch/arm64/conf/Makefile.arm64 b/sys/arch/arm64/conf/Makefile.arm64 index 3d81d8b1da7..47227b8d425 100644 --- a/sys/arch/arm64/conf/Makefile.arm64 +++ b/sys/arch/arm64/conf/Makefile.arm64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.arm64,v 1.41 2021/12/17 14:59:22 patrick Exp $ +# $OpenBSD: Makefile.arm64,v 1.42 2022/01/14 06:53:16 jsg Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -35,6 +35,7 @@ INCLUDES= -nostdinc -I$S -I${.OBJDIR} -I$S/arch \ -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/swsmu/smu13 \ -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 \ diff --git a/sys/arch/powerpc64/conf/Makefile.powerpc64 b/sys/arch/powerpc64/conf/Makefile.powerpc64 index af763b3c878..8e1d768b591 100644 --- a/sys/arch/powerpc64/conf/Makefile.powerpc64 +++ b/sys/arch/powerpc64/conf/Makefile.powerpc64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.powerpc64,v 1.12 2021/12/17 14:59:22 patrick Exp $ +# $OpenBSD: Makefile.powerpc64,v 1.13 2022/01/14 06:53:17 jsg Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -35,6 +35,7 @@ INCLUDES= -nostdinc -I$S -I${.OBJDIR} -I$S/arch \ -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/swsmu/smu13 \ -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 \ |