summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@hobbes.virtuousgeek.org>2007-04-12 11:40:12 -0700
committerJesse Barnes <jbarnes@hobbes.virtuousgeek.org>2007-04-12 11:40:12 -0700
commite183a091ff44e5b03ec521696830c45b2ce9ce87 (patch)
tree4432c2c4f920cd4271ab3535ff8d82e728b72752 /shared-core
parent2160e267ff3e1a503ab7666b60ffe21f4a90b803 (diff)
Initialize the hw lock waitqueue so we don't hang in drm_lastclose.
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/i915_init.c2
1 files changed, 1 insertions, 1 deletions
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);