Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
gpu
/
drm
/
radeon
/
radeon_ttm.c
diff --git
a/kernel/drivers/gpu/drm/radeon/radeon_ttm.c
b/kernel/drivers/gpu/drm/radeon/radeon_ttm.c
index
e06ac54
..
3531033
100644
(file)
--- a/
kernel/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/
kernel/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);
{
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);
}
return drm_vma_node_verify_access(&rbo->gem_base.vma_node, filp);
}
@@
-261,8
+263,8
@@
static int radeon_move_blit(struct ttm_buffer_object *bo,
rdev = radeon_get_rdev(bo->bdev);
ridx = radeon_copy_ring_index(rdev);
rdev = radeon_get_rdev(bo->bdev);
ridx = radeon_copy_ring_index(rdev);
- old_start = old_mem->start << PAGE_SHIFT;
- new_start = new_mem->start << PAGE_SHIFT;
+ old_start =
(u64)
old_mem->start << PAGE_SHIFT;
+ new_start =
(u64)
new_mem->start << PAGE_SHIFT;
switch (old_mem->mem_type) {
case TTM_PL_VRAM:
switch (old_mem->mem_type) {
case TTM_PL_VRAM: