diff options
author | rnoland <rnoland@FreeBSD.org> | 2008-08-23 20:59:12 +0000 |
---|---|---|
committer | rnoland <rnoland@FreeBSD.org> | 2008-08-23 20:59:12 +0000 |
commit | 8ebfdfe248e93b41d01041a5ec069bf5761f8741 (patch) | |
tree | 702bd8b6b1d2549932511454499d13cba551297c /sys/dev/drm/sis_drv.c | |
parent | cd5da88fc1464a435965660ff2af024771c4333b (diff) | |
download | FreeBSD-src-8ebfdfe248e93b41d01041a5ec069bf5761f8741.zip FreeBSD-src-8ebfdfe248e93b41d01041a5ec069bf5761f8741.tar.gz |
Update drm kernel drivers.
This is a sync to mesa/drm pre-gem, with a few fixes on top of that.
It also contains one local patch supplied by kib@ that I can't apply to
git.master shared code.
Approved by: flz
Obtained from: mesa/drm git.master
MFC after: 2 weeks
Diffstat (limited to 'sys/dev/drm/sis_drv.c')
-rw-r--r-- | sys/dev/drm/sis_drv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/drm/sis_drv.c b/sys/dev/drm/sis_drv.c index 04d1451..a07f60a 100644 --- a/sys/dev/drm/sis_drv.c +++ b/sys/dev/drm/sis_drv.c @@ -39,7 +39,7 @@ static drm_pci_id_list_t sis_pciidlist[] = { sis_PCI_IDS }; -static void sis_configure(drm_device_t *dev) +static void sis_configure(struct drm_device *dev) { dev->driver.buf_priv_size = 1; /* No dev_priv */ dev->driver.context_ctor = sis_init_context; @@ -69,9 +69,9 @@ sis_probe(device_t dev) static int sis_attach(device_t nbdev) { - drm_device_t *dev = device_get_softc(nbdev); + struct drm_device *dev = device_get_softc(nbdev); - bzero(dev, sizeof(drm_device_t)); + bzero(dev, sizeof(struct drm_device)); sis_configure(dev); return drm_attach(nbdev, sis_pciidlist); } @@ -88,7 +88,7 @@ static device_method_t sis_methods[] = { static driver_t sis_driver = { "drm", sis_methods, - sizeof(drm_device_t) + sizeof(struct drm_device) }; extern devclass_t drm_devclass; @@ -103,7 +103,7 @@ MODULE_DEPEND(sisdrm, drm, 1, 1, 1); #ifdef _LKM CFDRIVER_DECL(sis, DV_TTY, NULL); #else -CFATTACH_DECL(sis, sizeof(drm_device_t), drm_probe, drm_attach, drm_detach, +CFATTACH_DECL(sis, sizeof(struct drm_device), drm_probe, drm_attach, drm_detach, drm_activate); #endif #endif |