summaryrefslogtreecommitdiffstats
path: root/sys/modules
diff options
context:
space:
mode:
authoranholt <anholt@FreeBSD.org>2003-03-09 02:08:30 +0000
committeranholt <anholt@FreeBSD.org>2003-03-09 02:08:30 +0000
commitccdf4ef2d9288d035e56820efb0e79db6acf5ba8 (patch)
treeef9d3b03548e9f28bd5c265be746871660c0c16a /sys/modules
parent0b60094f80a8137660b368df0b80fb0179b92d04 (diff)
downloadFreeBSD-src-ccdf4ef2d9288d035e56820efb0e79db6acf5ba8.zip
FreeBSD-src-ccdf4ef2d9288d035e56820efb0e79db6acf5ba8.tar.gz
Update the DRM to latest from DRI CVS. This is approximately the version
included in XFree86 4.3, but includes some fixes. Notable changes include Radeon 8500-9100 support, PCI Radeon/Rage 128 support, transform & lighting support for Radeons, and vblank syncing support for r128, radeon, and mga. The gamma driver was removed due to lack of any users.
Diffstat (limited to 'sys/modules')
-rw-r--r--sys/modules/drm/Makefile2
-rw-r--r--sys/modules/drm/gamma/Makefile9
-rw-r--r--sys/modules/drm/mga/Makefile3
-rw-r--r--sys/modules/drm/r128/Makefile2
-rw-r--r--sys/modules/drm/radeon/Makefile3
5 files changed, 6 insertions, 13 deletions
diff --git a/sys/modules/drm/Makefile b/sys/modules/drm/Makefile
index 0a37484..6657994 100644
--- a/sys/modules/drm/Makefile
+++ b/sys/modules/drm/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD$
-SUBDIR = gamma mga r128 radeon tdfx
+SUBDIR = mga r128 radeon tdfx
.include <bsd.subdir.mk>
diff --git a/sys/modules/drm/gamma/Makefile b/sys/modules/drm/gamma/Makefile
deleted file mode 100644
index 3931c9d..0000000
--- a/sys/modules/drm/gamma/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../../dev/drm
-KMOD = gamma
-NOMAN = YES
-SRCS = gamma_drv.c gamma_dma.c
-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 78fb75f..2199a0b 100644
--- a/sys/modules/drm/mga/Makefile
+++ b/sys/modules/drm/mga/Makefile
@@ -3,7 +3,8 @@
.PATH: ${.CURDIR}/../../../dev/drm
KMOD = mga
NOMAN = YES
-SRCS = mga_drv.c mga_state.c mga_warp.c mga_dma.c
+SRCS = mga_drv.c mga_state.c mga_warp.c mga_dma.c \
+ mga_irq.c
SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/drm/r128/Makefile b/sys/modules/drm/r128/Makefile
index 7d699e8..822a1fe 100644
--- a/sys/modules/drm/r128/Makefile
+++ b/sys/modules/drm/r128/Makefile
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR}/../../../dev/drm
KMOD = r128
NOMAN = YES
-SRCS = r128_cce.c r128_drv.c r128_state.c
+SRCS = r128_cce.c r128_drv.c r128_irq.c r128_state.c
SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/drm/radeon/Makefile b/sys/modules/drm/radeon/Makefile
index 7d7d91e..7a3fad7 100644
--- a/sys/modules/drm/radeon/Makefile
+++ b/sys/modules/drm/radeon/Makefile
@@ -3,7 +3,8 @@
.PATH: ${.CURDIR}/../../../dev/drm
KMOD = radeon
NOMAN = YES
-SRCS = radeon_cp.c radeon_drv.c radeon_state.c
+SRCS = radeon_cp.c radeon_drv.c radeon_irq.c \
+ radeon_mem.c radeon_state.c
SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h
.include <bsd.kmod.mk>
OpenPOWER on IntegriCloud