[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.

diff --git a/bsd-core/i915_drv.c b/bsd-core/i915_drv.c
index 71a8d64..7e74519 100644 (file)
--- a/bsd-core/i915_drv.c
+++ b/bsd-core/i915_drv.c
@@ -122,10 +122,13 @@ static int
 i915_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 i915_methods[] = {

diff --git a/bsd-core/mach64_drv.c b/bsd-core/mach64_drv.c
index f940e90..36f3cec 100644 (file)
--- a/bsd-core/mach64_drv.c
+++ b/bsd-core/mach64_drv.c
@@ -96,10 +96,13 @@ static int
 mach64_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 mach64_methods[] = {

diff --git a/bsd-core/mga_drv.c b/bsd-core/mga_drv.c
index 7abf2b0..8580960 100644 (file)
--- a/bsd-core/mga_drv.c
+++ b/bsd-core/mga_drv.c
@@ -142,10 +142,13 @@ static int
 mga_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 mga_methods[] = {

diff --git a/bsd-core/r128_drv.c b/bsd-core/r128_drv.c
index 03a97da..5d4dfed 100644 (file)
--- a/bsd-core/r128_drv.c
+++ b/bsd-core/r128_drv.c
@@ -95,10 +95,13 @@ static int
 r128_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 r128_methods[] = {

diff --git a/bsd-core/radeon_drv.c b/bsd-core/radeon_drv.c
index 019f705..50a2f6b 100644 (file)
--- a/bsd-core/radeon_drv.c
+++ b/bsd-core/radeon_drv.c
@@ -100,10 +100,13 @@ static int
 radeon_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 radeon_methods[] = {

diff --git a/bsd-core/savage_drv.c b/bsd-core/savage_drv.c
index f0c6c06..36dd34a 100644 (file)
--- a/bsd-core/savage_drv.c
+++ b/bsd-core/savage_drv.c
@@ -86,10 +86,13 @@ static int
 savage_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 savage_methods[] = {

diff --git a/bsd-core/sis_drv.c b/bsd-core/sis_drv.c
index 8ad6414..bcf4ffd 100644 (file)
--- a/bsd-core/sis_drv.c
+++ b/bsd-core/sis_drv.c
@@ -80,10 +80,13 @@ static int
 sis_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 sis_methods[] = {

diff --git a/bsd-core/tdfx_drv.c b/bsd-core/tdfx_drv.c
index 8fafe0f..8d9e272 100644 (file)
--- a/bsd-core/tdfx_drv.c
+++ b/bsd-core/tdfx_drv.c
@@ -82,10 +82,13 @@ static int
 tdfx_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 tdfx_methods[] = {

diff --git a/bsd-core/via_drv.c b/bsd-core/via_drv.c
index cdd78d1..402b374 100644 (file)
--- 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[] = {