[PATCH 0/2] *** [libdrm] add REPLACE and CLEAR for VA op ***

[PATCH 0/2] *** [libdrm] add REPLACE and CLEAR for VA op ***

[Junwei Zhang]

Based on latest PRT support by Nicolai

Junwei Zhang (2):
  amdgpu: add new VA operations CLEAR and REPLACE
  amdgpu: add REPLACE and CLEAR checking for VA op

 amdgpu/amdgpu_bo.c       | 5 ++++-
 include/drm/amdgpu_drm.h | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

-- 
1.9.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH 1/2] amdgpu: add new VA operations CLEAR and REPLACE

[Junwei Zhang]

Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
---
 include/drm/amdgpu_drm.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h
index 7002dc4..a73b40a 100644
--- a/include/drm/amdgpu_drm.h
+++ b/include/drm/amdgpu_drm.h
@@ -410,6 +410,8 @@ struct drm_amdgpu_gem_op {
 
 #define AMDGPU_VA_OP_MAP			1
 #define AMDGPU_VA_OP_UNMAP			2
+#define AMDGPU_VA_OP_CLEAR			3
+#define AMDGPU_VA_OP_REPLACE			4
 
 /* Delay the page table update till the next CS */
 #define AMDGPU_VM_DELAY_UPDATE		(1 << 0)
-- 
1.9.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH 2/2] amdgpu: add REPLACE and CLEAR checking for VA op

[Junwei Zhang]

Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
---
 amdgpu/amdgpu_bo.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/amdgpu/amdgpu_bo.c b/amdgpu/amdgpu_bo.c
index 71cd666..8fe3cfd 100644
--- a/amdgpu/amdgpu_bo.c
+++ b/amdgpu/amdgpu_bo.c
@@ -952,7 +952,10 @@ int amdgpu_bo_va_op_raw(amdgpu_device_handle dev,
 	struct drm_amdgpu_gem_va va;
 	int r;
 
-	if (ops != AMDGPU_VA_OP_MAP && ops != AMDGPU_VA_OP_UNMAP)
+	if (ops != AMDGPU_VA_OP_MAP && ops != AMDGPU_VA_OP_UNMAP &&
+			ops != AMDGPU_VA_OP_REPLACE &&
+			ops != AMDGPU_VA_OP_CLEAR)
+
 		return -EINVAL;
 
 	memset(&va, 0, sizeof(va));
-- 
1.9.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 1/2] amdgpu: add new VA operations CLEAR and REPLACE

[Nicolai Hähnle]

This should use the proper procedure for updating amdgpu_drm.h, as 
explained in include/drm/README. I can take care of this as soon as all 
the kernel patches for PRT are in a tree that doesn't rebase (i.e. 
agd5f/drm-next-4.12 or airlied/drm-next).

Nicolai

On 17.03.2017 06:59, Junwei Zhang wrote:
> Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
> ---
>  include/drm/amdgpu_drm.h | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h
> index 7002dc4..a73b40a 100644
> --- a/include/drm/amdgpu_drm.h
> +++ b/include/drm/amdgpu_drm.h
> @@ -410,6 +410,8 @@ struct drm_amdgpu_gem_op {
>
>  #define AMDGPU_VA_OP_MAP			1
>  #define AMDGPU_VA_OP_UNMAP			2
> +#define AMDGPU_VA_OP_CLEAR			3
> +#define AMDGPU_VA_OP_REPLACE			4
>
>  /* Delay the page table update till the next CS */
>  #define AMDGPU_VM_DELAY_UPDATE		(1 << 0)
>

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 2/2] amdgpu: add REPLACE and CLEAR checking for VA op

[Nicolai Hähnle]

On 17.03.2017 06:59, Junwei Zhang wrote:
> Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
> ---
>  amdgpu/amdgpu_bo.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/amdgpu/amdgpu_bo.c b/amdgpu/amdgpu_bo.c
> index 71cd666..8fe3cfd 100644
> --- a/amdgpu/amdgpu_bo.c
> +++ b/amdgpu/amdgpu_bo.c
> @@ -952,7 +952,10 @@ int amdgpu_bo_va_op_raw(amdgpu_device_handle dev,
>  	struct drm_amdgpu_gem_va va;
>  	int r;
>
> -	if (ops != AMDGPU_VA_OP_MAP && ops != AMDGPU_VA_OP_UNMAP)
> +	if (ops != AMDGPU_VA_OP_MAP && ops != AMDGPU_VA_OP_UNMAP &&
> +			ops != AMDGPU_VA_OP_REPLACE &&
> +			ops != AMDGPU_VA_OP_CLEAR)

The indentation looks wrong. I believe the style is to use spaces so 
that the first 'ops' in each row lines up.

Cheers,
Nicolai

> +
>  		return -EINVAL;
>
>  	memset(&va, 0, sizeof(va));
>

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 1/2] amdgpu: add new VA operations CLEAR and REPLACE

[Zhang, Jerry (Junwei)]

On 03/21/2017 09:30 PM, Nicolai Hähnle wrote:
> This should use the proper procedure for updating amdgpu_drm.h, as explained in
> include/drm/README. I can take care of this as soon as all the kernel patches
> for PRT are in a tree that doesn't rebase (i.e. agd5f/drm-next-4.12 or
> airlied/drm-next).

Thanks, got it.

Jerry
>
> Nicolai
>
> On 17.03.2017 06:59, Junwei Zhang wrote:
>> Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
>> ---
>>  include/drm/amdgpu_drm.h | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h
>> index 7002dc4..a73b40a 100644
>> --- a/include/drm/amdgpu_drm.h
>> +++ b/include/drm/amdgpu_drm.h
>> @@ -410,6 +410,8 @@ struct drm_amdgpu_gem_op {
>>
>>  #define AMDGPU_VA_OP_MAP            1
>>  #define AMDGPU_VA_OP_UNMAP            2
>> +#define AMDGPU_VA_OP_CLEAR            3
>> +#define AMDGPU_VA_OP_REPLACE            4
>>
>>  /* Delay the page table update till the next CS */
>>  #define AMDGPU_VM_DELAY_UPDATE        (1 << 0)
>>
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx