From ad8eb0ed01d96cc16cdafd3b48c0f0cd73d315b4 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 27 May 2008 14:12:51 -0700 Subject: [FreeBSD] Convert from drm_device_t to struct drm_device for consistency. --- bsd-core/radeon_drv.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bsd-core/radeon_drv.c') diff --git a/bsd-core/radeon_drv.c b/bsd-core/radeon_drv.c index 93f875c5..dd04d2c4 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; @@ -90,9 +90,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 +109,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 +124,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__ */ -- cgit v1.2.3 From 8cd045079e21093437b99cb150b97403e945d2c2 Mon Sep 17 00:00:00 2001 From: Robert Noland Date: Fri, 23 May 2008 14:36:05 -0400 Subject: [FreeBSD] Add vblank-rework support and get drivers building. The i915 driver now works again. --- bsd-core/radeon_drv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'bsd-core/radeon_drv.c') diff --git a/bsd-core/radeon_drv.c b/bsd-core/radeon_drv.c index dd04d2c4..0b4dba18 100644 --- a/bsd-core/radeon_drv.c +++ b/bsd-core/radeon_drv.c @@ -52,8 +52,9 @@ static void radeon_configure(struct drm_device *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; -- cgit v1.2.3