diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-06-08 04:48:17 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-06-08 04:48:17 +0000 |
| commit | 999f0686e0633f8b7bb9b76a14e47f5c20d2ea36 (patch) | |
| tree | dbe3cb52b25db114fa92d119c4d7489e1632683b /sys/arch | |
| parent | 8f362563d8e3edaf51e661f18685f44716781993 (diff) | |
update drm to linux 5.7
adds kernel support for
amdgpu: vega20, raven2, renoir, navi10, navi14
inteldrm: icelake, tigerlake
Thanks to the OpenBSD Foundation for sponsoring this work, kettenis@ for
helping, patrick@ for helping adapt rockchip drm and many developers for
testing.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/conf/Makefile.amd64 | 34 | ||||
| -rw-r--r-- | sys/arch/arm64/conf/Makefile.arm64 | 7 | ||||
| -rw-r--r-- | sys/arch/i386/conf/Makefile.i386 | 5 |
3 files changed, 40 insertions, 6 deletions
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64 index 449f82d639b..e6f09734584 100644 --- a/sys/arch/amd64/conf/Makefile.amd64 +++ b/sys/arch/amd64/conf/Makefile.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.amd64,v 1.117 2019/11/07 20:42:28 guenther Exp $ +# $OpenBSD: Makefile.amd64,v 1.118 2020/06/08 04:47:57 jsg Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -36,7 +36,11 @@ INCLUDES= -nostdinc -I$S -I${.OBJDIR} -I$S/arch \ -I$S/dev/pci/drm/amd/powerplay/hwmgr \ -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/modules/inc + -I$S/dev/pci/drm/amd/display/dc/clk_mgr \ + -I$S/dev/pci/drm/amd/display/modules/inc \ + -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 CWARNFLAGS= -Werror -Wall -Wimplicit-function-declaration \ -Wno-uninitialized -Wno-pointer-sign \ @@ -184,10 +188,36 @@ dcn_calc_auto.o: $S/dev/pci/drm/amd/display/dc/calcs/dcn_calc_auto.c ${NORMAL_C} ${HARDFLOAT_CFLAGS} 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} +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 + ${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_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 + ${NORMAL_C} ${HARDFLOAT_CFLAGS} +display_rq_dlg_calc_21.o: $S/dev/pci/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c + ${NORMAL_C} ${HARDFLOAT_CFLAGS} dml1_display_rq_dlg_calc.o: $S/dev/pci/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c ${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 + ${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 + ${NORMAL_C} ${HARDFLOAT_CFLAGS} +rc_calc_dpi.o: $S/dev/pci/drm/amd/display/dc/dsc/rc_calc_dpi.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 62dc0df522e..f35a39e412d 100644 --- a/sys/arch/arm64/conf/Makefile.arm64 +++ b/sys/arch/arm64/conf/Makefile.arm64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.arm64,v 1.35 2019/11/07 20:42:28 guenther Exp $ +# $OpenBSD: Makefile.arm64,v 1.36 2020/06/08 04:47:58 jsg Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -36,7 +36,10 @@ INCLUDES= -nostdinc -I$S -I${.OBJDIR} -I$S/arch \ -I$S/dev/pci/drm/amd/powerplay/hwmgr \ -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/modules/inc + -I$S/dev/pci/drm/amd/display/dc/clk_mgr \ + -I$S/dev/pci/drm/amd/display/modules/inc \ + -I$S/dev/pci/drm/amd/display/modules/hdcp \ + -I$S/dev/pci/drm/amd/display/dmub/inc CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP CWARNFLAGS= -Werror -Wall -Wimplicit-function-declaration \ -Wno-uninitialized -Wno-pointer-sign \ diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index 6c4e5659913..e674b529106 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.i386,v 1.137 2019/12/08 12:25:30 mpi Exp $ +# $OpenBSD: Makefile.i386,v 1.138 2020/06/08 04:47:58 jsg Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -23,7 +23,8 @@ _archdir?= $S/arch/${_arch} INCLUDES= -nostdinc -I$S -I${.OBJDIR} -I$S/arch \ -I$S/dev/pci/drm/include \ - -I$S/dev/pci/drm/include/uapi + -I$S/dev/pci/drm/include/uapi \ + -I$S/dev/pci/drm/i915 CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -MD -MP CWARNFLAGS= -Werror -Wall -Wimplicit-function-declaration \ -Wno-uninitialized -Wno-pointer-sign \ |