diff options
| author | anholt <anholt@FreeBSD.org> | 2005-11-28 23:13:57 +0000 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2005-11-28 23:13:57 +0000 |
| commit | 3de8a0378fe9d46d02eec1b0054452fdcdee5327 (patch) | |
| tree | 1cdf797deb33b0b51180c1ae0a987558664b1077 /sys/dev/drm/tdfx_drv.c | |
| parent | e6a12190f6e28e22e3376a0729d6dd9cee1982bc (diff) | |
| download | FreeBSD-src-3de8a0378fe9d46d02eec1b0054452fdcdee5327.zip FreeBSD-src-3de8a0378fe9d46d02eec1b0054452fdcdee5327.tar.gz | |
Update DRM to CVS snapshot as of 2005-11-28. Notable changes:
- S3 Savage driver ported.
- Added support for ATI_fragment_shader registers for r200.
- Improved r300 support, needed for latest r300 DRI driver.
- (possibly) r300 PCIE support, needs X.Org server from CVS.
- Added support for PCI Matrox cards.
- Software fallbacks fixed for Rage 128, which used to render badly or hang.
- Some issues reported by WITNESS are fixed.
- i915 module Makefile added, as the driver may now be working, but is untested.
- Added scripts for copying and preprocessing DRM CVS for inclusion in the
kernel. Thanks to Daniel Stone for getting me started on that.
Diffstat (limited to 'sys/dev/drm/tdfx_drv.c')
| -rw-r--r-- | sys/dev/drm/tdfx_drv.c | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/sys/dev/drm/tdfx_drv.c b/sys/dev/drm/tdfx_drv.c index e99bb32..c193ecc 100644 --- a/sys/dev/drm/tdfx_drv.c +++ b/sys/dev/drm/tdfx_drv.c @@ -30,9 +30,11 @@ * Daryll Strauss <daryll@valinux.com> * Gareth Hughes <gareth@valinux.com> * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "dev/drm/tdfx_drv.h" #include "dev/drm/drmP.h" #include "dev/drm/drm_pciids.h" @@ -42,23 +44,20 @@ static drm_pci_id_list_t tdfx_pciidlist[] = { tdfx_PCI_IDS }; -extern drm_ioctl_desc_t tdfx_ioctls[]; -extern int tdfx_max_ioctl; - static void tdfx_configure(drm_device_t *dev) { - dev->dev_priv_size = 1; /* No dev_priv */ + dev->driver.buf_priv_size = 1; /* No dev_priv */ - dev->max_driver_ioctl = 0; + dev->driver.max_ioctl = 0; - dev->driver_name = DRIVER_NAME; - dev->driver_desc = DRIVER_DESC; - dev->driver_date = DRIVER_DATE; - dev->driver_major = DRIVER_MAJOR; - dev->driver_minor = DRIVER_MINOR; - dev->driver_patchlevel = DRIVER_PATCHLEVEL; + dev->driver.name = DRIVER_NAME; + dev->driver.desc = DRIVER_DESC; + dev->driver.date = DRIVER_DATE; + dev->driver.major = DRIVER_MAJOR; + dev->driver.minor = DRIVER_MINOR; + dev->driver.patchlevel = DRIVER_PATCHLEVEL; - dev->use_mtrr = 1; + dev->driver.use_mtrr = 1; } #ifdef __FreeBSD__ @@ -98,5 +97,10 @@ DRIVER_MODULE(tdfx, pci, tdfx_driver, drm_devclass, 0, 0); MODULE_DEPEND(tdfx, drm, 1, 1, 1); #elif defined(__NetBSD__) || defined(__OpenBSD__) +#ifdef _LKM CFDRIVER_DECL(tdfx, DV_TTY, NULL); +#else +CFATTACH_DECL(tdfx, sizeof(drm_device_t), drm_probe, drm_attach, drm_detach, + drm_activate); +#endif #endif |
