From a686be5bc8c5d8a260513b680f322e3b790aadf7 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Sat, 21 May 2005 02:27:51 +0000 Subject: Change the MGA initialization and cleanup a bit. The dev_private structure is now allocated (and partially filled in) by the new mga_driver_preinit function. This allows the driver to detect the type of card (i.e., G200 class vs. G400 class) on its own. The chipset value passed to mga_dma_init is now ignored. This same technique is used by the radeon DRM. As a result of this, mga_driver_pretakedown was converted to mga_driver_postcleanup. This routine gets called in some other places than might be expected, and it sets the dev_private pointer to NULL. That little gem took over an hour to track down. :( --- bsd-core/mga_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bsd-core') diff --git a/bsd-core/mga_drv.c b/bsd-core/mga_drv.c index 1dd4c81b..e088ceca 100644 --- a/bsd-core/mga_drv.c +++ b/bsd-core/mga_drv.c @@ -52,7 +52,8 @@ static void mga_configure(drm_device_t *dev) { dev->dev_priv_size = sizeof(drm_mga_buf_priv_t); /* XXX dev->prerelease = mga_driver_prerelease; */ - dev->pretakedown = mga_driver_pretakedown; + dev->preinit = mga_driver_preinit; + dev->postcleanup = mga_driver_postcleanup; dev->vblank_wait = mga_driver_vblank_wait; dev->irq_preinstall = mga_driver_irq_preinstall; dev->irq_postinstall = mga_driver_irq_postinstall; -- cgit v1.2.3