From e183a091ff44e5b03ec521696830c45b2ce9ce87 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Thu, 12 Apr 2007 11:40:12 -0700 Subject: Initialize the hw lock waitqueue so we don't hang in drm_lastclose. --- shared-core/i915_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'shared-core') diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c index 687eaa4b..f0ab4574 100644 --- a/shared-core/i915_init.c +++ b/shared-core/i915_init.c @@ -173,6 +173,7 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags) i915_dma_cleanup(dev); return DRM_ERR(EINVAL); } + init_waitqueue_head(&dev->lock.lock_queue); /* FIXME: assume sarea_priv is right after SAREA */ dev_priv->sarea_priv = dev_priv->sarea->handle + sizeof(drm_sarea_t); @@ -280,7 +281,6 @@ int i915_driver_unload(drm_device_t *dev) drm_i915_private_t *dev_priv = dev->dev_private; struct drm_framebuffer *fb; - /* FIXME: remove framebuffer */ intel_modeset_cleanup(dev); drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER); -- cgit v1.2.3