diff options
author | Eric Anholt <eric@anholt.net> | 2008-08-08 14:05:01 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2008-08-08 14:05:01 -0700 |
commit | e1b8e79796b172c356af98eb49107c8abbebfe5a (patch) | |
tree | 4af674ca495ca93535f057ea4c0385c57825c2e4 /linux-core/drm_memory.c | |
parent | 0c47151a571827905c34649208e22f8ec0175d62 (diff) | |
parent | 46e9274e8538e5b0517f611dca99dde611f4e95d (diff) |
Merge branch 'drm-gem'
Conflicts:
shared-core/i915_dma.c
This brings in kernel support and userland interface for intel GEM.
Diffstat (limited to 'linux-core/drm_memory.c')
-rw-r--r-- | linux-core/drm_memory.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux-core/drm_memory.c b/linux-core/drm_memory.c index e1df3dac..b90fc020 100644 --- a/linux-core/drm_memory.c +++ b/linux-core/drm_memory.c @@ -310,6 +310,7 @@ int drm_free_agp(DRM_AGP_MEM * handle, int pages) { return drm_agp_free_memory(handle) ? 0 : -EINVAL; } +EXPORT_SYMBOL(drm_free_agp); /** Wrapper around agp_bind_memory() */ int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start) @@ -322,6 +323,7 @@ int drm_unbind_agp(DRM_AGP_MEM * handle) { return drm_agp_unbind_memory(handle); } +EXPORT_SYMBOL(drm_unbind_agp); #else /* __OS_HAS_AGP*/ static void *agp_remap(unsigned long offset, unsigned long size, |