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/mga_drv.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bsd-core/mga_drv.c') diff --git a/bsd-core/mga_drv.c b/bsd-core/mga_drv.c index 5dc7efea..7b20ea00 100644 --- a/bsd-core/mga_drv.c +++ b/bsd-core/mga_drv.c @@ -59,7 +59,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; @@ -84,7 +84,7 @@ 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; @@ -129,9 +129,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); } @@ -148,7 +148,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; @@ -163,7 +163,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 -- 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/mga_drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'bsd-core/mga_drv.c') diff --git a/bsd-core/mga_drv.c b/bsd-core/mga_drv.c index 7b20ea00..15d8175c 100644 --- a/bsd-core/mga_drv.c +++ b/bsd-core/mga_drv.c @@ -90,7 +90,9 @@ static void mga_configure(struct drm_device *dev) 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; -- cgit v1.2.3