diff options
author | Dave Airlie <airlied@redhat.com> | 2008-12-18 18:23:14 -0500 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2008-12-29 02:47:24 -0500 |
commit | 4e74f36d08e83390121d088f1f62e3337603df89 (patch) | |
tree | 45c72eac210ad97f3f817d602d3d47e8a9edf12d /drivers/gpu | |
parent | 60f2ee0b4a6b852299d8e30aeb2af517ef5ee19c (diff) |
drm/radeon: use locked rmmap to remove sarea mapping.
this exports the locked version of the symbol as struct_mutex locks it all.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/drm_bufs.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_cp.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index 7fb690bcd492..72c667f9bee1 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c | |||
@@ -440,6 +440,7 @@ int drm_rmmap_locked(struct drm_device *dev, drm_local_map_t *map) | |||
440 | 440 | ||
441 | return 0; | 441 | return 0; |
442 | } | 442 | } |
443 | EXPORT_SYMBOL(drm_rmmap_locked); | ||
443 | 444 | ||
444 | int drm_rmmap(struct drm_device *dev, drm_local_map_t *map) | 445 | int drm_rmmap(struct drm_device *dev, drm_local_map_t *map) |
445 | { | 446 | { |
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c index 4f5d1e996217..63212d7bbc28 100644 --- a/drivers/gpu/drm/radeon/radeon_cp.c +++ b/drivers/gpu/drm/radeon/radeon_cp.c | |||
@@ -1804,7 +1804,7 @@ void radeon_master_destroy(struct drm_device *dev, struct drm_master *master) | |||
1804 | 1804 | ||
1805 | master_priv->sarea_priv = NULL; | 1805 | master_priv->sarea_priv = NULL; |
1806 | if (master_priv->sarea) | 1806 | if (master_priv->sarea) |
1807 | drm_rmmap(dev, master_priv->sarea); | 1807 | drm_rmmap_locked(dev, master_priv->sarea); |
1808 | 1808 | ||
1809 | drm_free(master_priv, sizeof(*master_priv), DRM_MEM_DRIVER); | 1809 | drm_free(master_priv, sizeof(*master_priv), DRM_MEM_DRIVER); |
1810 | 1810 | ||