aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2002-04-28 04:58:40 +0000
committerEric Anholt <anholt@FreeBSD.org>2002-04-28 04:58:40 +0000
commit67a2a28fe4d538923a18aab45d2dc8581dee9dca (patch)
tree381c9e7f7e17acca286dce174f87a487fa76b5ac
parentf76dbb6f5ee5ff7bf59a36ec8042867ecc91f7eb (diff)
Notes
Diffstat
-rw-r--r--sys/conf/NOTES20
-rw-r--r--sys/conf/files13
-rw-r--r--sys/conf/options4
-rw-r--r--sys/dev/drm/gamma_drv.c1
-rw-r--r--sys/dev/drm/mga_drv.c1
-rw-r--r--sys/dev/drm/r128_drv.c1
-rw-r--r--sys/dev/drm/radeon_drv.c1
-rw-r--r--sys/dev/drm/tdfx_drv.c1
-rw-r--r--sys/modules/Makefile1
-rw-r--r--sys/modules/drm/gamma/Makefile2
-rw-r--r--sys/modules/drm/mga/Makefile2
-rw-r--r--sys/modules/drm/r128/Makefile2
-rw-r--r--sys/modules/drm/radeon/Makefile2
-rw-r--r--sys/modules/drm/tdfx/Makefile2
14 files changed, 43 insertions, 10 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index b10bd54f01c1..6c32fdc55c0c 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1087,6 +1087,26 @@ options ACPI_DEBUG
# Optional devices:
#
+# DRM options:
+# gammadrm: 3Dlabs Oxygen GMX 2000
+# mgadrm: AGP Matrox G200, G400, G450, G550
+# tdfxdrm: 3dfx Voodoo 3/4/5 and Banshee
+# r128drm: AGP ATI Rage 128
+# radeondrm: AGP ATI Radeon, including 7200 and 7500
+# DRM_LINUX: include linux compatibility, requires COMPAT_LINUX
+# DRM_DEBUG: inlcude debugging code, very slow
+#
+# mga, r128, and radeon require AGP in the kernel
+
+device gammadrm
+device mgadrm
+device "r128drm"
+device radeondrm
+device tdfxdrm
+
+options DRM_DEBUG
+options DRM_LINUX
+
# 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create
# the /dev/3dfx0 device to work with glide implementations. This should get
# linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as
diff --git a/sys/conf/files b/sys/conf/files
index 030b9afd5510..4367c884a76b 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -311,6 +311,19 @@ dev/digi/Xr.c optional digi_Xr
dev/dpt/dpt_eisa.c optional dpt eisa
dev/dpt/dpt_pci.c optional dpt pci
dev/dpt/dpt_scsi.c optional dpt
+dev/drm/gamma_dma.c optional gammadrm
+dev/drm/gamma_drv.c optional gammadrm
+dev/drm/mga_dma.c optional mgadrm
+dev/drm/mga_drv.c optional mgadrm
+dev/drm/mga_state.c optional mgadrm
+dev/drm/mga_warp.c optional mgadrm
+dev/drm/r128_cce.c optional r128drm
+dev/drm/r128_drv.c optional r128drm
+dev/drm/r128_state.c optional r128drm
+dev/drm/radeon_cp.c optional radeondrm
+dev/drm/radeon_drv.c optional radeondrm
+dev/drm/radeon_state.c optional radeondrm
+dev/drm/tdfx_drv.c optional tdfxdrm
dev/ed/if_ed.c optional ed
dev/ed/if_ed_pccard.c optional ed card
dev/ed/if_ed_pccard.c optional ed pccard
diff --git a/sys/conf/options b/sys/conf/options
index f93557dca7a8..55eeecc94bb0 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -332,6 +332,10 @@ NETGRAPH_TTY opt_netgraph.h
NETGRAPH_UI opt_netgraph.h
NETGRAPH_VJC opt_netgraph.h
+# DRM options
+DRM_LINUX opt_drm.h
+DRM_DEBUG opt_drm.h
+
# ATM (HARP version)
ATM_CORE opt_atm.h
ATM_IP opt_atm.h
diff --git a/sys/dev/drm/gamma_drv.c b/sys/dev/drm/gamma_drv.c
index 7defc26cd465..b94d4834f4ab 100644
--- a/sys/dev/drm/gamma_drv.c
+++ b/sys/dev/drm/gamma_drv.c
@@ -38,7 +38,6 @@
#include <sys/types.h>
#include <sys/bus.h>
#include <pci/pcivar.h>
-#include <opt_drm_linux.h>
#endif /* __FreeBSD__ */
#include "dev/drm/gamma.h"
#include "dev/drm/drmP.h"
diff --git a/sys/dev/drm/mga_drv.c b/sys/dev/drm/mga_drv.c
index 62728a249c5e..d781f6eab330 100644
--- a/sys/dev/drm/mga_drv.c
+++ b/sys/dev/drm/mga_drv.c
@@ -39,7 +39,6 @@
#include <sys/types.h>
#include <sys/bus.h>
#include <pci/pcivar.h>
-#include <opt_drm_linux.h>
#endif /* __FreeBSD__ */
#include "dev/drm/mga.h"
diff --git a/sys/dev/drm/r128_drv.c b/sys/dev/drm/r128_drv.c
index e6ce5fd7db4e..f79237fb7aab 100644
--- a/sys/dev/drm/r128_drv.c
+++ b/sys/dev/drm/r128_drv.c
@@ -39,7 +39,6 @@
#include <sys/types.h>
#include <sys/bus.h>
#include <pci/pcivar.h>
-#include <opt_drm_linux.h>
#endif /* __FreeBSD__ */
#include "dev/drm/r128.h"
diff --git a/sys/dev/drm/radeon_drv.c b/sys/dev/drm/radeon_drv.c
index dc9b083946df..15a5563b96ed 100644
--- a/sys/dev/drm/radeon_drv.c
+++ b/sys/dev/drm/radeon_drv.c
@@ -38,7 +38,6 @@
#include <sys/types.h>
#include <sys/bus.h>
#include <pci/pcivar.h>
-#include <opt_drm_linux.h>
#endif /* __FreeBSD__ */
#include "dev/drm/radeon.h"
diff --git a/sys/dev/drm/tdfx_drv.c b/sys/dev/drm/tdfx_drv.c
index ecf7db235ea6..359cfc2fd0db 100644
--- a/sys/dev/drm/tdfx_drv.c
+++ b/sys/dev/drm/tdfx_drv.c
@@ -40,7 +40,6 @@
#include <sys/types.h>
#include <sys/bus.h>
#include <pci/pcivar.h>
-#include <opt_drm_linux.h>
#endif /* __FreeBSD__ */
#include "dev/drm/tdfx.h"
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index c17443237261..1e7bc9456e6f 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -21,6 +21,7 @@ SUBDIR= 3dfx \
dc \
de \
digi \
+ drm \
dummynet \
ed \
fdescfs \
diff --git a/sys/modules/drm/gamma/Makefile b/sys/modules/drm/gamma/Makefile
index 4d5902223d2a..3931c9d76927 100644
--- a/sys/modules/drm/gamma/Makefile
+++ b/sys/modules/drm/gamma/Makefile
@@ -4,6 +4,6 @@
KMOD = gamma
NOMAN = YES
SRCS = gamma_drv.c gamma_dma.c
-SRCS += device_if.h bus_if.h pci_if.h opt_drm.h opt_drm_linux.h
+SRCS += device_if.h bus_if.h pci_if.h opt_drm.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/drm/mga/Makefile b/sys/modules/drm/mga/Makefile
index 55ffa14d0660..8dd95b976688 100644
--- a/sys/modules/drm/mga/Makefile
+++ b/sys/modules/drm/mga/Makefile
@@ -4,7 +4,7 @@
KMOD = mga
NOMAN = YES
SRCS = mga_drv.c mga_state.c mga_warp.c mga_dma.c
-SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h opt_drm_linux.h
+SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h
KMODDEPS= agp
.include <bsd.kmod.mk>
diff --git a/sys/modules/drm/r128/Makefile b/sys/modules/drm/r128/Makefile
index 947e3075c487..0df5c01b8441 100644
--- a/sys/modules/drm/r128/Makefile
+++ b/sys/modules/drm/r128/Makefile
@@ -4,7 +4,7 @@
KMOD = r128
NOMAN = YES
SRCS = r128_cce.c r128_drv.c r128_state.c
-SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h opt_drm_linux.h
+SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h
KMODDEPS= agp
.include <bsd.kmod.mk>
diff --git a/sys/modules/drm/radeon/Makefile b/sys/modules/drm/radeon/Makefile
index 079dc0df534e..6ff5fb815d3f 100644
--- a/sys/modules/drm/radeon/Makefile
+++ b/sys/modules/drm/radeon/Makefile
@@ -4,7 +4,7 @@
KMOD = radeon
NOMAN = YES
SRCS = radeon_cp.c radeon_drv.c radeon_state.c
-SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h opt_drm_linux.h
+SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h
KMODDEPS= agp
.include <bsd.kmod.mk>
diff --git a/sys/modules/drm/tdfx/Makefile b/sys/modules/drm/tdfx/Makefile
index 70bdf56e560e..7012558e2a76 100644
--- a/sys/modules/drm/tdfx/Makefile
+++ b/sys/modules/drm/tdfx/Makefile
@@ -4,6 +4,6 @@
KMOD = tdfx
NOMAN = YES
SRCS = tdfx_drv.c
-SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h opt_drm_linux.h
+SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h
.include <bsd.kmod.mk>
generated by cgit v1.3 (git 2.53.0) at 2026-08-01 12:17:10 +0000