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/mach64_drv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bsd-core/mach64_drv.c') diff --git a/bsd-core/mach64_drv.c b/bsd-core/mach64_drv.c index 31c45e53..35d0c805 100644 --- a/bsd-core/mach64_drv.c +++ b/bsd-core/mach64_drv.c @@ -44,7 +44,7 @@ static drm_pci_id_list_t mach64_pciidlist[] = { mach64_PCI_IDS }; -static void mach64_configure(drm_device_t *dev) +static void mach64_configure(struct drm_device *dev) { dev->driver.buf_priv_size = 1; /* No dev_priv */ dev->driver.lastclose = mach64_driver_lastclose; @@ -83,9 +83,9 @@ mach64_probe(device_t dev) static int mach64_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)); mach64_configure(dev); return drm_attach(nbdev, mach64_pciidlist); } @@ -102,7 +102,7 @@ static device_method_t mach64_methods[] = { static driver_t mach64_driver = { "drm", mach64_methods, - sizeof(drm_device_t) + sizeof(struct drm_device) }; extern devclass_t drm_devclass; -- 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/mach64_drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'bsd-core/mach64_drv.c') diff --git a/bsd-core/mach64_drv.c b/bsd-core/mach64_drv.c index 35d0c805..06e0133d 100644 --- a/bsd-core/mach64_drv.c +++ b/bsd-core/mach64_drv.c @@ -48,7 +48,9 @@ static void mach64_configure(struct drm_device *dev) { dev->driver.buf_priv_size = 1; /* No dev_priv */ dev->driver.lastclose = mach64_driver_lastclose; - dev->driver.vblank_wait = mach64_driver_vblank_wait; + dev->driver.get_vblank_counter = mach64_get_vblank_counter; + dev->driver.enable_vblank = mach64_enable_vblank; + dev->driver.disable_vblank = mach64_disable_vblank; dev->driver.irq_preinstall = mach64_driver_irq_preinstall; dev->driver.irq_postinstall = mach64_driver_irq_postinstall; dev->driver.irq_uninstall = mach64_driver_irq_uninstall; -- cgit v1.2.3