summaryrefslogtreecommitdiff
path: root/linux-core/xgi_pcie.c
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2007-08-06 17:27:15 -0700
committerIan Romanick <idr@us.ibm.com>2007-08-06 17:27:15 -0700
commitf7ba02b7458823627097a2320bf9befa84fc9c76 (patch)
treebc04994f289611ed53737b37b9391b6b4ea36dae /linux-core/xgi_pcie.c
parent6718198897ef9e275506d3fcb497641e1b09d3b1 (diff)
Unify infrastructure for freeing on-card / GART memory.
Diffstat (limited to 'linux-core/xgi_pcie.c')
-rw-r--r--linux-core/xgi_pcie.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/linux-core/xgi_pcie.c b/linux-core/xgi_pcie.c
index b2edf3b1..281223b3 100644
--- a/linux-core/xgi_pcie.c
+++ b/linux-core/xgi_pcie.c
@@ -152,29 +152,12 @@ int xgi_pcie_alloc_ioctl(struct drm_device * dev, void * data,
}
-int xgi_pcie_free(struct xgi_info * info, unsigned long offset,
- struct drm_file * filp)
-{
- int err;
-
- mutex_lock(&info->dev->struct_mutex);
- err = xgi_mem_free(&info->pcie_heap, offset, filp);
- mutex_unlock(&info->dev->struct_mutex);
-
- if (err) {
- DRM_ERROR("xgi_pcie_free() failed at base 0x%lx\n", offset);
- }
-
- return err;
-}
-
-
int xgi_pcie_free_ioctl(struct drm_device * dev, void * data,
struct drm_file * filp)
{
struct xgi_info *info = dev->dev_private;
- return xgi_pcie_free(info, *(u32 *) data, filp);
+ return xgi_free(info, XGI_MEMLOC_NON_LOCAL | *(u32 *) data, filp);
}