From: Dave Airlie <airlied@redhat.com>
Date: Mon, 4 Aug 2008 04:53:45 +0000 (+1000)
Subject: i915/radeon: use rmmap locked
X-Git-Tag: libdrm-2.4.3~16^2~105^2~5^2~34
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af6efc3d778b96164849f822331938c4cdf8f4b2;p=platform%2Fupstream%2Flibdrm.git

i915/radeon: use rmmap locked
---

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 3a652e8..dc21868 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -443,7 +443,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);
 
diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index 48f72ab..b69fadb 100644
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
@@ -2535,7 +2535,7 @@ void radeon_master_destroy(struct drm_device *dev, struct drm_master *master)
 
 	master_priv->sarea_priv = NULL;
 	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);