aboutsummaryrefslogtreecommitdiff
path: root/linux-core/xgi_pcie.c
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2007-08-06 16:17:23 -0700
committerIan Romanick <idr@us.ibm.com>2007-08-06 16:17:23 -0700
commit90907c59152f628d6f0efea4927a06e547f4a3c7 (patch)
tree9bae338845d3446c6e131e9d96afadb038a2386c /linux-core/xgi_pcie.c
parentf96bff9e213a950ab910832908d30e732435e628 (diff)
Replace per-heap semaphores with drm_device::struct_mutex.
Diffstat (limited to 'linux-core/xgi_pcie.c')
-rw-r--r--linux-core/xgi_pcie.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/linux-core/xgi_pcie.c b/linux-core/xgi_pcie.c
index c0d424f5..883fbe7e 100644
--- a/linux-core/xgi_pcie.c
+++ b/linux-core/xgi_pcie.c
@@ -161,7 +161,7 @@ void xgi_pcie_free_all(struct xgi_info * info, struct drm_file * filp)
return;
}
- down(&info->pcie_sem);
+ mutex_lock(&info->dev->struct_mutex);
do {
struct xgi_mem_block *block;
@@ -179,7 +179,7 @@ void xgi_pcie_free_all(struct xgi_info * info, struct drm_file * filp)
(void) xgi_mem_free(&info->pcie_heap, block->offset, filp);
} while(1);
- up(&info->pcie_sem);
+ mutex_unlock(&info->dev->struct_mutex);
}
@@ -188,9 +188,9 @@ int xgi_pcie_free(struct xgi_info * info, unsigned long offset,
{
int err;
- down(&info->pcie_sem);
+ mutex_lock(&info->dev->struct_mutex);
err = xgi_mem_free(&info->pcie_heap, offset, filp);
- up(&info->pcie_sem);
+ mutex_unlock(&info->dev->struct_mutex);
if (err) {
DRM_ERROR("xgi_pcie_free() failed at base 0x%lx\n", offset);