i915/radeon: use rmmap locked
authorDave Airlie <airlied@redhat.com>
Mon, 4 Aug 2008 04:53:45 +0000 (14:53 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 4 Aug 2008 04:54:02 +0000 (14:54 +1000)
shared-core/i915_init.c
shared-core/radeon_cp.c

index 3a652e8..dc21868 100644 (file)
@@ -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);
 
index 48f72ab..b69fadb 100644 (file)
@@ -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);