diff options
author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-02-19 15:17:24 +0000 |
---|---|---|
committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-02-19 15:17:24 +0000 |
commit | 8caf6e95712bfae8d1a42ffabafcbb9686766116 (patch) | |
tree | 44a508f79c9da34c96fa30f6bc91ce5fe4746705 /shared-core/i915_init.c | |
parent | f24ed2ad6c66e50268fd175146a1661ae4bbd350 (diff) |
Fix up conflicts for DRI2 (untested)
Diffstat (limited to 'shared-core/i915_init.c')
-rw-r--r-- | shared-core/i915_init.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c index c2d8964e..fe2fb389 100644 --- a/shared-core/i915_init.c +++ b/shared-core/i915_init.c @@ -269,6 +269,19 @@ int i915_driver_unload(struct drm_device *dev) drm_core_ioremapfree(&dev_priv->ring.map, dev); } #endif + if (dev_priv->sarea_kmap.virtual) { + drm_bo_kunmap(&dev_priv->sarea_kmap); + dev_priv->sarea_kmap.virtual = NULL; + dev->primary->master->lock.hw_lock = NULL; + dev->sigdata.lock = NULL; + } + + if (dev_priv->sarea_bo) { + mutex_lock(&dev->struct_mutex); + drm_bo_usage_deref_locked(&dev_priv->sarea_bo); + mutex_unlock(&dev->struct_mutex); + dev_priv->sarea_bo = NULL; + } if (dev_priv->status_page_dmah) { drm_pci_free(dev, dev_priv->status_page_dmah); |