From ac165058b7de2768bb1bde4f9d42aa0c1bfadde4 Mon Sep 17 00:00:00 2001 From: Robert Noland Date: Sat, 30 Aug 2008 00:53:30 +0000 Subject: [PATCH] We need to lock around driver unload now. The i915 driver installs it's register map at load time now. We can't remove the map during unload without holding the lock. Approved by: kib --- sys/dev/drm/drm_drv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/dev/drm/drm_drv.c b/sys/dev/drm/drm_drv.c index dd818bbdc79..7ed2393e6f0 100644 --- a/sys/dev/drm/drm_drv.c +++ b/sys/dev/drm/drm_drv.c @@ -660,8 +660,11 @@ static void drm_unload(struct drm_device *dev) dev->agp = NULL; } - if (dev->driver.unload != NULL) + if (dev->driver.unload != NULL) { + DRM_LOCK(); dev->driver.unload(dev); + DRM_UNLOCK(); + } delete_unrhdr(dev->drw_unrhdr);