Module Name: src
Committed By: martin
Date: Wed Feb 22 18:34:30 UTC 2023
Modified Files:
src/sys/modules/drmkms [netbsd-10]: Makefile
src/sys/modules/drmkms_pci [netbsd-10]: Makefile
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #97):
sys/modules/drmkms/Makefile: revision 1.19
sys/modules/drmkms_pci/Makefile: revision 1.11
sys/modules/drmkms: Remove GPU scheduler files.
These have been moved out to drmkms_sched.kmod.
sys/modules/drmkms_pci: Remove drm_agpsupport.c.
This was moved to a separate drmkms_agp module.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.4.1 src/sys/modules/drmkms/Makefile
cvs rdiff -u -r1.10 -r1.10.4.1 src/sys/modules/drmkms_pci/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/modules/drmkms/Makefile
diff -u src/sys/modules/drmkms/Makefile:1.18 src/sys/modules/drmkms/Makefile:1.18.4.1
--- src/sys/modules/drmkms/Makefile:1.18 Sun Jul 17 15:35:42 2022
+++ src/sys/modules/drmkms/Makefile Wed Feb 22 18:34:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2022/07/17 15:35:42 riastradh Exp $
+# $NetBSD: Makefile,v 1.18.4.1 2023/02/22 18:34:30 martin Exp $
.include "../Makefile.inc"
.include "Makefile.inc"
@@ -52,10 +52,7 @@ SRCS+= drm_legacy_misc.c
SRCS+= drm_lock.c
SRCS+= drm_scatter.c
-# GPU scheduler
-SRCS+= sched_entity.c
-SRCS+= sched_fence.c
-SRCS+= sched_main.c
+# GPU scheduler is separatd out into drmkms_sched.kmod
# Upstream source files.
#SRCS+= drm_agpsupport.c
Index: src/sys/modules/drmkms_pci/Makefile
diff -u src/sys/modules/drmkms_pci/Makefile:1.10 src/sys/modules/drmkms_pci/Makefile:1.10.4.1
--- src/sys/modules/drmkms_pci/Makefile:1.10 Sun Dec 19 11:54:25 2021
+++ src/sys/modules/drmkms_pci/Makefile Wed Feb 22 18:34:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/12/19 11:54:25 riastradh Exp $
+# $NetBSD: Makefile,v 1.10.4.1 2023/02/22 18:34:30 martin Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -13,7 +13,6 @@ KMOD= drmkms_pci
SRCS+= drmfb_pci.c
SRCS+= linux_pci.c
-SRCS+= drm_agpsupport.c
SRCS+= drm_pci.c
SRCS+= drm_pci_module.c
