Module Name: src
Committed By: riastradh
Date: Sun Jul 24 20:05:01 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/amdgpu: files.amdgpu
src/sys/modules/amdgpu: Makefile
Log Message:
amdgpu: Sprinkle missing COPTS.amdgpu_float options.
For some reason x86 didn't need these but aarch64 does.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/external/bsd/drm2/amdgpu/files.amdgpu
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/amdgpu/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/amdgpu/files.amdgpu
diff -u src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.28 src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.29
--- src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.28 Sat Jul 23 12:52:09 2022
+++ src/sys/external/bsd/drm2/amdgpu/files.amdgpu Sun Jul 24 20:05:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: files.amdgpu,v 1.28 2022/07/23 12:52:09 riastradh Exp $
+# $NetBSD: files.amdgpu,v 1.29 2022/07/24 20:05:00 riastradh Exp $
version 20180827
@@ -70,6 +70,7 @@ elifdef aarch64
makeoptions amdgpu "COPTS.amdgpu_float"+="-march=armv8-a"
endif
+makeoptions amdgpu "COPTS.amdgpu_dcn10_resource.c"+="${COPTS.amdgpu_float}"
makeoptions amdgpu "COPTS.amdgpu_dcn20_resource.c"+="${COPTS.amdgpu_float}"
makeoptions amdgpu "COPTS.amdgpu_dcn21_resource.c"+="${COPTS.amdgpu_float}"
makeoptions amdgpu "COPTS.amdgpu_dcn_calc_auto.c"+="${COPTS.amdgpu_float}"
@@ -82,10 +83,12 @@ makeoptions amdgpu "COPTS.amdgpu_display
makeoptions amdgpu "COPTS.amdgpu_display_rq_dlg_calc_20.c"+="${COPTS.amdgpu_float}"
makeoptions amdgpu "COPTS.amdgpu_display_rq_dlg_calc_20v2.c"+="${COPTS.amdgpu_float}"
makeoptions amdgpu "COPTS.amdgpu_display_rq_dlg_calc_21.c"+="${COPTS.amdgpu_float}"
+makeoptions amdgpu "COPTS.amdgpu_display_rq_dlg_helpers.c"+="${COPTS.amdgpu_float}"
makeoptions amdgpu "COPTS.amdgpu_dml1_display_rq_dlg_calc.c"+="${COPTS.amdgpu_float}"
makeoptions amdgpu "COPTS.amdgpu_dml_common_defs.c"+="${COPTS.amdgpu_float}"
makeoptions amdgpu "COPTS.amdgpu_rc_calc.c"+="${COPTS.amdgpu_float}"
makeoptions amdgpu "COPTS.amdgpu_rc_calc_dpi.c"+="${COPTS.amdgpu_float}"
+makeoptions amdgpu "COPTS.amdgpu_rn_clk_mgr.c"+="${COPTS.amdgpu_float}"
# Local additions.
file external/bsd/drm2/amdgpu/amdgpu_module.c amdgpu
Index: src/sys/modules/amdgpu/Makefile
diff -u src/sys/modules/amdgpu/Makefile:1.1 src/sys/modules/amdgpu/Makefile:1.2
--- src/sys/modules/amdgpu/Makefile:1.1 Sun Dec 19 12:39:09 2021
+++ src/sys/modules/amdgpu/Makefile Sun Jul 24 20:05:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/12/19 12:39:09 riastradh Exp $
+# $NetBSD: Makefile,v 1.2 2022/07/24 20:05:00 riastradh Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -54,6 +54,7 @@ CWARNFLAGS.amdgpu_navi10_ppt.c+= -Wno-ty
CWARNFLAGS.amdgpu_rn_clk_mgr.c+= -Wno-type-limits
CWARNFLAGS.amdgpu_vega10_reg_init.c+= -Wno-cast-qual
CWARNFLAGS.amdgpu_vega20_reg_init.c+= -Wno-cast-qual
+COPTS.amdgpu_dcn10_resource.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_dcn20_resource.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_dcn21_resource.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_dcn_calc_auto.c+= ${COPTS.amdgpu_float}
@@ -66,10 +67,12 @@ COPTS.amdgpu_display_mode_vba_21.c+= ${C
COPTS.amdgpu_display_rq_dlg_calc_20.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_display_rq_dlg_calc_20v2.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_display_rq_dlg_calc_21.c+= ${COPTS.amdgpu_float}
+COPTS.amdgpu_display_rq_dlg_helpers.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_dml1_display_rq_dlg_calc.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_dml_common_defs.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_rc_calc.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_rc_calc_dpi.c+= ${COPTS.amdgpu_float}
+COPTS.amdgpu_rn_clk_mgr.c+= ${COPTS.amdgpu_float}
# sed -ne 's,^file \(external/bsd/drm2/.*\)/[^/ ]* .*,.PATH: \1,gp' <files.amdgpu | sort -u
.PATH: ${S}/external/bsd/drm2/amdgpu
