diff options
| author | Jerome Glisse <glisse@freedesktop.org> | 2008-03-10 23:36:27 +0100 |
|---|---|---|
| committer | John Doe <glisse@freedesktop.org> | 2008-03-10 23:36:27 +0100 |
| commit | a7e6ca62ad0d9c3c45fd9e1d81b59c2db2d714cf (patch) | |
| tree | 8f757eeaa2c234af14ca1df515de7810e770ed91 /linux-core/drm_bo.c | |
| parent | a7dc4d08b9b4f8fe6fcaa4c778f6dd3718d1e36a (diff) | |
| parent | 9f19e79f955281b9de393219e4ad9835ffe29c49 (diff) | |
Merge branch 'modesetting-101' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Diffstat (limited to 'linux-core/drm_bo.c')
| -rw-r--r-- | linux-core/drm_bo.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c index b6115e8d..1d3f87e5 100644 --- a/linux-core/drm_bo.c +++ b/linux-core/drm_bo.c @@ -969,7 +969,7 @@ static int drm_bo_modify_proposed_flags (struct drm_buffer_object *bo, return -EINVAL; } - if ((new_mask & DRM_BO_FLAG_NO_EVICT) && !DRM_SUSER(DRM_CURPROC)) { + if (bo->type != drm_bo_type_kernel && (new_mask & DRM_BO_FLAG_NO_EVICT) && !DRM_SUSER(DRM_CURPROC)) { DRM_ERROR("DRM_BO_FLAG_NO_EVICT is only available to priviliged processes.\n"); return -EPERM; } @@ -1065,7 +1065,7 @@ static int drm_bo_busy(struct drm_buffer_object *bo) return 0; } -static int drm_bo_evict_cached(struct drm_buffer_object *bo) +int drm_bo_evict_cached(struct drm_buffer_object *bo) { int ret = 0; @@ -1075,6 +1075,7 @@ static int drm_bo_evict_cached(struct drm_buffer_object *bo) return ret; } +EXPORT_SYMBOL(drm_bo_evict_cached); /* * Wait until a buffer is unmapped. */ |