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/mga_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/mga_drv.c')
| -rw-r--r-- | sys/dev/drm/mga_drv.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sys/dev/drm/mga_drv.c b/sys/dev/drm/mga_drv.c index 8bde4fd..e5de7d7 100644 --- a/sys/dev/drm/mga_drv.c +++ b/sys/dev/drm/mga_drv.c @@ -62,7 +62,7 @@ static drm_pci_id_list_t mga_pciidlist[] = { * This function needs to be filled in! The implementation in * linux-core/mga_drv.c shows what needs to be done. */ -static int mga_driver_device_is_agp(drm_device_t * dev) +static int mga_driver_device_is_agp(struct drm_device * dev) { device_t bus; @@ -87,13 +87,15 @@ static int mga_driver_device_is_agp(drm_device_t * dev) return DRM_MIGHT_BE_AGP; } -static void mga_configure(drm_device_t *dev) +static void mga_configure(struct drm_device *dev) { dev->driver.buf_priv_size = sizeof(drm_mga_buf_priv_t); dev->driver.load = mga_driver_load; dev->driver.unload = mga_driver_unload; dev->driver.lastclose = mga_driver_lastclose; - dev->driver.vblank_wait = mga_driver_vblank_wait; + dev->driver.get_vblank_counter = mga_get_vblank_counter; + dev->driver.enable_vblank = mga_enable_vblank; + dev->driver.disable_vblank = mga_disable_vblank; dev->driver.irq_preinstall = mga_driver_irq_preinstall; dev->driver.irq_postinstall = mga_driver_irq_postinstall; dev->driver.irq_uninstall = mga_driver_irq_uninstall; @@ -132,9 +134,9 @@ mga_probe(device_t dev) static int mga_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)); mga_configure(dev); return drm_attach(nbdev, mga_pciidlist); } @@ -151,7 +153,7 @@ static device_method_t mga_methods[] = { static driver_t mga_driver = { "drm", mga_methods, - sizeof(drm_device_t) + sizeof(struct drm_device) }; extern devclass_t drm_devclass; @@ -166,7 +168,7 @@ MODULE_DEPEND(mga, drm, 1, 1, 1); #ifdef _LKM CFDRIVER_DECL(mga, DV_TTY, NULL); #else -CFATTACH_DECL(mga, sizeof(drm_device_t), drm_probe, drm_attach, drm_detach, +CFATTACH_DECL(mga, sizeof(struct drm_device), drm_probe, drm_attach, drm_detach, drm_activate); #endif #endif |
