diff options
| author | Eric Anholt <eric@anholt.net> | 2008-05-30 14:42:08 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-05-30 14:42:08 -0700 |
| commit | 461bfa3da6f85b85c21cd84f81bb4eefa5481418 (patch) | |
| tree | 33e91c8cd024f67922670f9ed6565ceda1e4f3b5 /bsd-core/radeon_drv.c | |
| parent | 50bce2bc625deb439dd61f504496dddd0cd4f572 (diff) | |
| parent | 6e8a2cff66ac0d6afaf9bb233bc81449c2014078 (diff) | |
Merge commit 'origin/master' into drm-gem
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_drv.h
shared-core/nouveau_state.c
Diffstat (limited to 'bsd-core/radeon_drv.c')
| -rw-r--r-- | bsd-core/radeon_drv.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/bsd-core/radeon_drv.c b/bsd-core/radeon_drv.c index 93f875c5..0b4dba18 100644 --- a/bsd-core/radeon_drv.c +++ b/bsd-core/radeon_drv.c @@ -42,7 +42,7 @@ static drm_pci_id_list_t radeon_pciidlist[] = { radeon_PCI_IDS }; -static void radeon_configure(drm_device_t *dev) +static void radeon_configure(struct drm_device *dev) { dev->driver.buf_priv_size = sizeof(drm_radeon_buf_priv_t); dev->driver.load = radeon_driver_load; @@ -52,8 +52,9 @@ static void radeon_configure(drm_device_t *dev) dev->driver.preclose = radeon_driver_preclose; dev->driver.postclose = radeon_driver_postclose; dev->driver.lastclose = radeon_driver_lastclose; - dev->driver.vblank_wait = radeon_driver_vblank_wait; - dev->driver.vblank_wait2 = radeon_driver_vblank_wait2; + dev->driver.get_vblank_counter = radeon_get_vblank_counter; + dev->driver.enable_vblank = radeon_enable_vblank; + dev->driver.disable_vblank = radeon_disable_vblank; dev->driver.irq_preinstall = radeon_driver_irq_preinstall; dev->driver.irq_postinstall = radeon_driver_irq_postinstall; dev->driver.irq_uninstall = radeon_driver_irq_uninstall; @@ -90,9 +91,9 @@ radeon_probe(device_t dev) static int radeon_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)); radeon_configure(dev); return drm_attach(nbdev, radeon_pciidlist); } @@ -109,7 +110,7 @@ static device_method_t radeon_methods[] = { static driver_t radeon_driver = { "drm", radeon_methods, - sizeof(drm_device_t) + sizeof(struct drm_device) }; extern devclass_t drm_devclass; @@ -124,7 +125,7 @@ MODULE_DEPEND(radeon, drm, 1, 1, 1); #ifdef _LKM CFDRIVER_DECL(radeon, DV_TTY, NULL); #else -CFATTACH_DECL(radeon, sizeof(drm_device_t), drm_probe, drm_attach, drm_detach, - drm_activate); +CFATTACH_DECL(radeon, sizeof(struct drm_device), drm_probe, drm_attach, + drm_detach, drm_activate); #endif #endif /* __FreeBSD__ */ |