diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-03-07 11:59:21 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-03-07 11:59:21 +1100 |
| commit | f96baf1e1ec10768ea2027f75ebaef46f7d7f30a (patch) | |
| tree | 1c387c45449a42e5692dcc3d1a62e39dcd8ca53f /linux-core/drm_bo.c | |
| parent | ccae12a837e7b17c4e9211295ecbd18807020742 (diff) | |
| parent | 2540ea7dc6c0c4f0ebca3370d6ec7359e4276e13 (diff) | |
Merge branch 'master' of ../../drm into modesetting-101
Diffstat (limited to 'linux-core/drm_bo.c')
| -rw-r--r-- | linux-core/drm_bo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c index c41f726c..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; } |