* [PATCH] drm/amdgpu: fix userptr flags check
@ 2015-11-26 10:06 Christian König
2015-11-27 2:42 ` Michel Dänzer
0 siblings, 1 reply; 3+ messages in thread
From: Christian König @ 2015-11-26 10:06 UTC (permalink / raw)
To: alexdeucher; +Cc: dri-devel
From: Christian König <christian.koenig@amd.com>
That got messed up while porting it from Radeon.
Signed-off-by: Christian König <christian.koenig@amd.com>
Cc: stable@vger.kernel.org
---
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 00c5b58..af53215 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -242,8 +242,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 */
--
2.5.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drm/amdgpu: fix userptr flags check
2015-11-26 10:06 [PATCH] drm/amdgpu: fix userptr flags check Christian König
@ 2015-11-27 2:42 ` Michel Dänzer
2015-11-30 19:40 ` Alex Deucher
0 siblings, 1 reply; 3+ messages in thread
From: Michel Dänzer @ 2015-11-27 2:42 UTC (permalink / raw)
To: Christian König, alexdeucher; +Cc: dri-devel
On 26.11.2015 19:06, Christian König wrote:
> From: Christian König <christian.koenig@amd.com>
>
> That got messed up while porting it from Radeon.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> Cc: stable@vger.kernel.org
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> index 00c5b58..af53215 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> @@ -242,8 +242,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 */
>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Mesa and X developer
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] drm/amdgpu: fix userptr flags check
2015-11-27 2:42 ` Michel Dänzer
@ 2015-11-30 19:40 ` Alex Deucher
0 siblings, 0 replies; 3+ messages in thread
From: Alex Deucher @ 2015-11-30 19:40 UTC (permalink / raw)
To: Michel Dänzer; +Cc: Maling list - DRI developers
On Thu, Nov 26, 2015 at 9:42 PM, Michel Dänzer <michel@daenzer.net> wrote:
> On 26.11.2015 19:06, Christian König wrote:
>> From: Christian König <christian.koenig@amd.com>
>>
>> That got messed up while porting it from Radeon.
>>
>> Signed-off-by: Christian König <christian.koenig@amd.com>
>> Cc: stable@vger.kernel.org
>> ---
>> drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 5 +++--
>> 1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
>> index 00c5b58..af53215 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
>> @@ -242,8 +242,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 */
>>
>
> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Applied. thanks!
Alex
>
>
> --
> Earthling Michel Dänzer | http://www.amd.com
> Libre software enthusiast | Mesa and X developer
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-11-30 19:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-26 10:06 [PATCH] drm/amdgpu: fix userptr flags check Christian König
2015-11-27 2:42 ` Michel Dänzer
2015-11-30 19:40 ` Alex Deucher
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.