projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8c14f72
)
drm/amdgpu: fix userptr flags check
author
Christian König
<
[email protected]
>
Thu, 26 Nov 2015 10:06:20 +0000
(11:06 +0100)
committer
Alex Deucher
<
[email protected]
>
Mon, 30 Nov 2015 19:38:47 +0000
(14:38 -0500)
That got messed up while porting it from Radeon.
Reviewed-by: Michel Dänzer <
[email protected]
>
Signed-off-by: Christian König <
[email protected]
>
Cc:
[email protected]
Signed-off-by: Alex Deucher <
[email protected]
>
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index fc32fc01a64ba8f1d68ae8621af29195287881c8..f6ea4b43a60c59b144bc5ff9916d96af38a59b24 100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@
-235,8
+235,9
@@
int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,
AMDGPU_GEM_USERPTR_REGISTER))
return -EINVAL;
- if (!(args->flags & AMDGPU_GEM_USERPTR_ANONONLY) ||
- !(args->flags & AMDGPU_GEM_USERPTR_REGISTER)) {
+ if (!(args->flags & AMDGPU_GEM_USERPTR_READONLY) && (
+ !(args->flags & AMDGPU_GEM_USERPTR_ANONONLY) ||
+ !(args->flags & AMDGPU_GEM_USERPTR_REGISTER))) {
/* if we want to write to it we must require anonymous
memory and install a MMU notifier */