diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-16 11:45:53 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-16 11:45:53 -0700 |
| commit | d313108167a793652a5fe4c1015198e0a9deac4c (patch) | |
| tree | 70702ea339cdcec621a8f7251c673c80a3acb73e /shared-core/i915_init.c | |
| parent | 893315d49ed678de95cf6ac553efb6093cc7343c (diff) | |
| parent | 2030db75328b7d896a5dd030fc171020b33149e1 (diff) | |
Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem
Diffstat (limited to 'shared-core/i915_init.c')
| -rw-r--r-- | shared-core/i915_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c index b21351c0..7b88cc8d 100644 --- a/shared-core/i915_init.c +++ b/shared-core/i915_init.c @@ -437,7 +437,7 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master) return; if (master_priv->sarea) - drm_rmmap(dev, master_priv->sarea); + drm_rmmap_locked(dev, master_priv->sarea); drm_free(master_priv, sizeof(*master_priv), DRM_MEM_DRIVER); |