From 67a2a28fe4d538923a18aab45d2dc8581dee9dca Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Sun, 28 Apr 2002 04:58:40 +0000 Subject: [PATCH] Hook the DRM up to the build and add it to NOTES. Approved by: des --- sys/conf/NOTES | 20 ++++++++++++++++++++ sys/conf/files | 13 +++++++++++++ sys/conf/options | 4 ++++ sys/dev/drm/gamma_drv.c | 1 - sys/dev/drm/mga_drv.c | 1 - sys/dev/drm/r128_drv.c | 1 - sys/dev/drm/radeon_drv.c | 1 - sys/dev/drm/tdfx_drv.c | 1 - sys/modules/Makefile | 1 + sys/modules/drm/gamma/Makefile | 2 +- sys/modules/drm/mga/Makefile | 2 +- sys/modules/drm/r128/Makefile | 2 +- sys/modules/drm/radeon/Makefile | 2 +- sys/modules/drm/tdfx/Makefile | 2 +- 14 files changed, 43 insertions(+), 10 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index b10bd54f01c..6c32fdc55c0 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 030b9afd551..4367c884a76 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 f93557dca7a..55eeecc94bb 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 7defc26cd46..b94d4834f4a 100644 --- a/sys/dev/drm/gamma_drv.c +++ b/sys/dev/drm/gamma_drv.c @@ -38,7 +38,6 @@ #include #include #include -#include #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 62728a249c5..d781f6eab33 100644 --- a/sys/dev/drm/mga_drv.c +++ b/sys/dev/drm/mga_drv.c @@ -39,7 +39,6 @@ #include #include #include -#include #endif /* __FreeBSD__ */ #include "dev/drm/mga.h" diff --git a/sys/dev/drm/r128_drv.c b/sys/dev/drm/r128_drv.c index e6ce5fd7db4..f79237fb7aa 100644 --- a/sys/dev/drm/r128_drv.c +++ b/sys/dev/drm/r128_drv.c @@ -39,7 +39,6 @@ #include #include #include -#include #endif /* __FreeBSD__ */ #include "dev/drm/r128.h" diff --git a/sys/dev/drm/radeon_drv.c b/sys/dev/drm/radeon_drv.c index dc9b083946d..15a5563b96e 100644 --- a/sys/dev/drm/radeon_drv.c +++ b/sys/dev/drm/radeon_drv.c @@ -38,7 +38,6 @@ #include #include #include -#include #endif /* __FreeBSD__ */ #include "dev/drm/radeon.h" diff --git a/sys/dev/drm/tdfx_drv.c b/sys/dev/drm/tdfx_drv.c index ecf7db235ea..359cfc2fd0d 100644 --- a/sys/dev/drm/tdfx_drv.c +++ b/sys/dev/drm/tdfx_drv.c @@ -40,7 +40,6 @@ #include #include #include -#include #endif /* __FreeBSD__ */ #include "dev/drm/tdfx.h" diff --git a/sys/modules/Makefile b/sys/modules/Makefile index c1744323726..1e7bc9456e6 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 4d5902223d2..3931c9d7692 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 diff --git a/sys/modules/drm/mga/Makefile b/sys/modules/drm/mga/Makefile index 55ffa14d066..8dd95b97668 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 diff --git a/sys/modules/drm/r128/Makefile b/sys/modules/drm/r128/Makefile index 947e3075c48..0df5c01b844 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 diff --git a/sys/modules/drm/radeon/Makefile b/sys/modules/drm/radeon/Makefile index 079dc0df534..6ff5fb815d3 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 diff --git a/sys/modules/drm/tdfx/Makefile b/sys/modules/drm/tdfx/Makefile index 70bdf56e560..7012558e2a7 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