diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-05-21 22:40:15 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-05-21 22:40:15 +0000 |
| commit | 2c78e1c71aab9aa1c7b3063005ee668d9ded6bdb (patch) | |
| tree | fb5311c48bb88d19d84f6e4c2b60dc98873b0f0f /sys/arch/amd64/conf | |
| parent | 2bdaaa2dc8fdb050bb8f43706af7e4335e5c4800 (diff) | |
add amdgpu from linux 4.19.44 for recent AMD Radeon parts
committing now so this can be worked on in tree
Thanks to the OpenBSD Foundation for sponsoring this work and kettenis@
for helping.
Diffstat (limited to 'sys/arch/amd64/conf')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 7 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/Makefile.amd64 | 30 |
2 files changed, 34 insertions, 3 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 92db6eeb9c0..ad192f4ea1d 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.471 2019/05/08 23:54:39 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.472 2019/05/21 22:40:06 jsg Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -370,6 +370,11 @@ drm0 at radeondrm? primary 1 drm* at radeondrm? wsdisplay0 at radeondrm? primary 1 wsdisplay* at radeondrm? mux -1 +#amdgpu* at pci? +#drm0 at amdgpu? primary 1 +#drm* at amdgpu? +#wsdisplay0 at amdgpu? primary 1 +#wsdisplay* at amdgpu? mux -1 pcppi0 at isa? diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64 index f4f7a5f6e18..5467add7fb4 100644 --- a/sys/arch/amd64/conf/Makefile.amd64 +++ b/sys/arch/amd64/conf/Makefile.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.amd64,v 1.114 2019/05/17 19:07:16 guenther Exp $ +# $OpenBSD: Makefile.amd64,v 1.115 2019/05/21 22:40:06 jsg Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -23,7 +23,20 @@ _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/amd/include/asic_reg \ + -I$S/dev/pci/drm/amd/include \ + -I$S/dev/pci/drm/amd/amdgpu \ + -I$S/dev/pci/drm/amd/display \ + -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/display/dc/inc \ + -I$S/dev/pci/drm/amd/display/dc/inc/hw \ + -I$S/dev/pci/drm/amd/display/modules/inc CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -MD -MP CWARNFLAGS= -Werror -Wall -Wimplicit-function-declaration \ -Wno-uninitialized -Wno-pointer-sign \ @@ -163,6 +176,19 @@ kcov.o: $S/dev/kcov.c ${NORMAL_C} -fno-sanitize-coverage=trace-pc,trace-cmp .endif +HARDFLOAT_CFLAGS= -msse -msse2 + +dcn_calcs.o: $S/dev/pci/drm/amd/display/dc/calcs/dcn_calcs.c + ${NORMAL_C} ${HARDFLOAT_CFLAGS} +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} +dml1_display_rq_dlg_calc.o: $S/dev/pci/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.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} + clean: rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* \ gap.link gapdummy.c ld.script lorder makegap.sh param.c |