From b92f5577670f99ded76e201a71aaa23cce8f7577 Mon Sep 17 00:00:00 2001 From: vehemens Date: Fri, 29 Aug 2008 12:40:30 -0400 Subject: [FreeBSD] Catch up to vblank rework for via. (No, we don't build via right now.) Signed-off-by: Robert Noland --- bsd-core/via_drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'bsd-core/via_drv.c') diff --git a/bsd-core/via_drv.c b/bsd-core/via_drv.c index 1d784eed..36b820a9 100644 --- a/bsd-core/via_drv.c +++ b/bsd-core/via_drv.c @@ -46,7 +46,9 @@ static void via_configure(struct drm_device *dev) dev->driver.unload = via_driver_unload; dev->driver.context_ctor = via_init_context; dev->driver.context_dtor = via_final_context; - dev->driver.vblank_wait = via_driver_vblank_wait; + dev->driver.get_vblank_counter = via_get_vblank_counter; + dev->driver.enable_vblank = via_enable_vblank; + dev->driver.disable_vblank = via_disable_vblank; dev->driver.irq_preinstall = via_driver_irq_preinstall; dev->driver.irq_postinstall = via_driver_irq_postinstall; dev->driver.irq_uninstall = via_driver_irq_uninstall; -- cgit v1.2.3 From 2649103bf9c4eb471a10800f4a3161dca6249086 Mon Sep 17 00:00:00 2001 From: vehemens Date: Fri, 29 Aug 2008 13:18:54 -0400 Subject: [FreeBSD] Convert drm_driver to a pointer like linux. Signed-off-by: Robert Noland --- bsd-core/via_drv.c | 71 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 29 deletions(-) (limited to 'bsd-core/via_drv.c') diff --git a/bsd-core/via_drv.c b/bsd-core/via_drv.c index 36b820a9..539e3ef3 100644 --- a/bsd-core/via_drv.c +++ b/bsd-core/via_drv.c @@ -41,34 +41,34 @@ static drm_pci_id_list_t via_pciidlist[] = { static void via_configure(struct drm_device *dev) { - dev->driver.buf_priv_size = 1; - dev->driver.load = via_driver_load; - dev->driver.unload = via_driver_unload; - dev->driver.context_ctor = via_init_context; - dev->driver.context_dtor = via_final_context; - dev->driver.get_vblank_counter = via_get_vblank_counter; - dev->driver.enable_vblank = via_enable_vblank; - dev->driver.disable_vblank = via_disable_vblank; - dev->driver.irq_preinstall = via_driver_irq_preinstall; - dev->driver.irq_postinstall = via_driver_irq_postinstall; - dev->driver.irq_uninstall = via_driver_irq_uninstall; - dev->driver.irq_handler = via_driver_irq_handler; - dev->driver.dma_quiescent = via_driver_dma_quiescent; - - dev->driver.ioctls = via_ioctls; - dev->driver.max_ioctl = via_max_ioctl; - - dev->driver.name = DRIVER_NAME; - dev->driver.desc = DRIVER_DESC; - dev->driver.date = DRIVER_DATE; - dev->driver.major = DRIVER_MAJOR; - dev->driver.minor = DRIVER_MINOR; - dev->driver.patchlevel = DRIVER_PATCHLEVEL; - - dev->driver.use_agp = 1; - dev->driver.use_mtrr = 1; - dev->driver.use_irq = 1; - dev->driver.use_vbl_irq = 1; + dev->driver->buf_priv_size = 1; + dev->driver->load = via_driver_load; + dev->driver->unload = via_driver_unload; + dev->driver->context_ctor = via_init_context; + dev->driver->context_dtor = via_final_context; + dev->driver->get_vblank_counter = via_get_vblank_counter; + dev->driver->enable_vblank = via_enable_vblank; + dev->driver->disable_vblank = via_disable_vblank; + dev->driver->irq_preinstall = via_driver_irq_preinstall; + dev->driver->irq_postinstall = via_driver_irq_postinstall; + dev->driver->irq_uninstall = via_driver_irq_uninstall; + dev->driver->irq_handler = via_driver_irq_handler; + dev->driver->dma_quiescent = via_driver_dma_quiescent; + + dev->driver->ioctls = via_ioctls; + dev->driver->max_ioctl = via_max_ioctl; + + dev->driver->name = DRIVER_NAME; + dev->driver->desc = DRIVER_DESC; + dev->driver->date = DRIVER_DATE; + dev->driver->major = DRIVER_MAJOR; + dev->driver->minor = DRIVER_MINOR; + dev->driver->patchlevel = DRIVER_PATCHLEVEL; + + dev->driver->use_agp = 1; + dev->driver->use_mtrr = 1; + dev->driver->use_irq = 1; + dev->driver->use_vbl_irq = 1; } #ifdef __FreeBSD__ @@ -84,15 +84,28 @@ via_attach(device_t nbdev) struct drm_device *dev = device_get_softc(nbdev); bzero(dev, sizeof(struct drm_device)); + + dev->driver = malloc(sizeof(struct drm_driver_info), M_DRM, M_ZERO); via_configure(dev); + return drm_attach(nbdev, via_pciidlist); } +static int +via_detach(device_t nbdev) +{ + struct drm_device *dev = device_get_softc(nbdev); + + free(dev->driver, M_DRM); + + return drm_detach(nbdev); +} + static device_method_t via_methods[] = { /* Device interface */ DEVMETHOD(device_probe, via_probe), DEVMETHOD(device_attach, via_attach), - DEVMETHOD(device_detach, drm_detach), + DEVMETHOD(device_detach, via_detach), { 0, 0 } }; -- cgit v1.2.3 From 2b278047153df729caf9e516a432b2e76398cd3a Mon Sep 17 00:00:00 2001 From: vehemens Date: Wed, 27 Aug 2008 19:11:04 -0700 Subject: [FreeBSD] Use driver features macros and flags Signed-off-by: Robert Noland --- bsd-core/via_drv.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'bsd-core/via_drv.c') diff --git a/bsd-core/via_drv.c b/bsd-core/via_drv.c index 539e3ef3..3b931e28 100644 --- a/bsd-core/via_drv.c +++ b/bsd-core/via_drv.c @@ -41,6 +41,9 @@ static drm_pci_id_list_t via_pciidlist[] = { static void via_configure(struct drm_device *dev) { + dev->driver->driver_features = + DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_HAVE_IRQ; + dev->driver->buf_priv_size = 1; dev->driver->load = via_driver_load; dev->driver->unload = via_driver_unload; @@ -64,11 +67,6 @@ static void via_configure(struct drm_device *dev) dev->driver->major = DRIVER_MAJOR; dev->driver->minor = DRIVER_MINOR; dev->driver->patchlevel = DRIVER_PATCHLEVEL; - - dev->driver->use_agp = 1; - dev->driver->use_mtrr = 1; - dev->driver->use_irq = 1; - dev->driver->use_vbl_irq = 1; } #ifdef __FreeBSD__ -- cgit v1.2.3 From ed6dd03818f2fa4dd0f2ba34dee58b09c7ff253e Mon Sep 17 00:00:00 2001 From: vehemens Date: Tue, 2 Sep 2008 02:43:19 -0700 Subject: Need M_NOWAIT for malloc. Signed-off-by: Robert Noland --- bsd-core/via_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bsd-core/via_drv.c') diff --git a/bsd-core/via_drv.c b/bsd-core/via_drv.c index 3b931e28..cdd78d19 100644 --- a/bsd-core/via_drv.c +++ b/bsd-core/via_drv.c @@ -83,7 +83,7 @@ via_attach(device_t nbdev) bzero(dev, sizeof(struct drm_device)); - dev->driver = malloc(sizeof(struct drm_driver_info), M_DRM, M_ZERO); + dev->driver = malloc(sizeof(struct drm_driver_info), M_DRM, M_NOWAIT | M_ZERO); via_configure(dev); return drm_attach(nbdev, via_pciidlist); -- cgit v1.2.3 From 828ae3f6b88b5a69a56b2961307e40ed95edea29 Mon Sep 17 00:00:00 2001 From: Robert Noland Date: Mon, 8 Sep 2008 16:40:52 -0400 Subject: [FreeBSD] We need to call drm_detach before we free dev->driver. The driver is in control of the show, so when you try and unload a module the driver detach routine is called first. It is what drives the whole unload process and so lots of panics occur if dev->driver is already free. --- bsd-core/via_drv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bsd-core/via_drv.c') diff --git a/bsd-core/via_drv.c b/bsd-core/via_drv.c index cdd78d19..402b374b 100644 --- a/bsd-core/via_drv.c +++ b/bsd-core/via_drv.c @@ -93,10 +93,13 @@ static int via_detach(device_t nbdev) { struct drm_device *dev = device_get_softc(nbdev); + int ret; + + ret = drm_detach(nbdev); free(dev->driver, M_DRM); - return drm_detach(nbdev); + return ret; } static device_method_t via_methods[] = { -- cgit v1.2.3 From 973c634eaa54ee4085a72102c690bc643cb2d7a8 Mon Sep 17 00:00:00 2001 From: vehemens Date: Mon, 8 Sep 2008 22:06:09 -0700 Subject: Remove incomplete and obsolete free/net/open code. Signed-off-by: Robert Noland --- bsd-core/via_drv.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'bsd-core/via_drv.c') diff --git a/bsd-core/via_drv.c b/bsd-core/via_drv.c index 402b374b..e5f7d493 100644 --- a/bsd-core/via_drv.c +++ b/bsd-core/via_drv.c @@ -69,7 +69,6 @@ static void via_configure(struct drm_device *dev) dev->driver->patchlevel = DRIVER_PATCHLEVEL; } -#ifdef __FreeBSD__ static int via_probe(device_t dev) { @@ -120,12 +119,3 @@ static driver_t via_driver = { extern devclass_t drm_devclass; DRIVER_MODULE(via, pci, via_driver, drm_devclass, 0, 0); MODULE_DEPEND(via, drm, 1, 1, 1); - -#elif defined(__NetBSD__) || defined(__OpenBSD__) -#ifdef _LKM -CFDRIVER_DECL(via, DV_TTY, NULL); -#else -CFATTACH_DECL(via, sizeof(struct drm_device), drm_probe, drm_attach, drm_detach, - drm_activate); -#endif -#endif -- cgit v1.2.3