projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.7/acpi6.1' into libnvdimm-for-next
[linux-2.6-block.git]
/
drivers
/
gpu
/
drm
/
radeon
/
radeon_ttm.c
diff --git
a/drivers/gpu/drm/radeon/radeon_ttm.c
b/drivers/gpu/drm/radeon/radeon_ttm.c
index 7dddfdce85e6be56f5d6bab8787fad82aa120809..90f739478a1b5257b488d120245d77d4cf561a70 100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/
drivers/gpu/drm/radeon/radeon_ttm.c
@@
-235,6
+235,8
@@
static int radeon_verify_access(struct ttm_buffer_object *bo, struct file *filp)
{
struct radeon_bo *rbo = container_of(bo, struct radeon_bo, tbo);
+ if (radeon_ttm_tt_has_userptr(bo->ttm))
+ return -EPERM;
return drm_vma_node_verify_access(&rbo->gem_base.vma_node, filp);
}