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/r128_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/r128_drv.c')
| -rw-r--r-- | sys/dev/drm/r128_drv.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sys/dev/drm/r128_drv.c b/sys/dev/drm/r128_drv.c index 71b4259..a290d22 100644 --- a/sys/dev/drm/r128_drv.c +++ b/sys/dev/drm/r128_drv.c @@ -45,12 +45,14 @@ static drm_pci_id_list_t r128_pciidlist[] = { r128_PCI_IDS }; -static void r128_configure(drm_device_t *dev) +static void r128_configure(struct drm_device *dev) { dev->driver.buf_priv_size = sizeof(drm_r128_buf_priv_t); dev->driver.preclose = r128_driver_preclose; dev->driver.lastclose = r128_driver_lastclose; - dev->driver.vblank_wait = r128_driver_vblank_wait; + dev->driver.get_vblank_counter = r128_get_vblank_counter; + dev->driver.enable_vblank = r128_enable_vblank; + dev->driver.disable_vblank = r128_disable_vblank; dev->driver.irq_preinstall = r128_driver_irq_preinstall; dev->driver.irq_postinstall = r128_driver_irq_postinstall; dev->driver.irq_uninstall = r128_driver_irq_uninstall; @@ -86,9 +88,9 @@ r128_probe(device_t dev) static int r128_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)); r128_configure(dev); return drm_attach(nbdev, r128_pciidlist); } @@ -105,7 +107,7 @@ static device_method_t r128_methods[] = { static driver_t r128_driver = { "drm", r128_methods, - sizeof(drm_device_t) + sizeof(struct drm_device) }; extern devclass_t drm_devclass; @@ -120,7 +122,7 @@ MODULE_DEPEND(r128, drm, 1, 1, 1); #ifdef _LKM CFDRIVER_DECL(r128, DV_TTY, NULL); #else -CFATTACH_DECL(r128, sizeof(drm_device_t), drm_probe, drm_attach, drm_detach, - drm_activate); +CFATTACH_DECL(r128, sizeof(struct drm_device), drm_probe, drm_attach, + drm_detach, drm_activate); #endif #endif |
