[PATCH 1/2] drm/amdgpu: fix 'ISO C90 forbids mixed declarations'

[PATCH 1/2] drm/amdgpu: fix 'ISO C90 forbids mixed declarations'

[Chunming Zhou]

Change-Id: I412f5783e2839c53841e6ab665f939236bdc5bf1
Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 9ea8fb077aba..12f0d18c6ee8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -657,12 +657,12 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
 				     p->bytes_moved_vis);
 
 	if (p->bo_list) {
-		gds = p->bo_list->gds_obj;
-		gws = p->bo_list->gws_obj;
-		oa = p->bo_list->oa_obj;
 		struct amdgpu_vm *vm = &fpriv->vm;
 		unsigned i;
 
+		gds = p->bo_list->gds_obj;
+		gws = p->bo_list->gws_obj;
+		oa = p->bo_list->oa_obj;
 		for (i = 0; i < p->bo_list->num_entries; i++) {
 			struct amdgpu_bo *bo = p->bo_list->array[i].robj;
 
-- 
2.14.1

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

[PATCH 2/2] drm/amdgpu: gds bo must not be per-vm-bo

[Chunming Zhou]

In per-vm-bo case, there could be no bo list.
But gds bo created from user space  must be passed to bo list.
So adding a check to prevent creat per-vm gds bo.

Change-Id: Idfa58c40447df0db2883413f9f7ccf56b47579f5
Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 556406a44da3..5fb156a01774 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -236,6 +236,13 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data,
 	/* create a gem object to contain this object in */
 	if (args->in.domains & (AMDGPU_GEM_DOMAIN_GDS |
 	    AMDGPU_GEM_DOMAIN_GWS | AMDGPU_GEM_DOMAIN_OA)) {
+		if (flags & AMDGPU_GEM_CREATE_VM_ALWAYS_VALID) {
+			/* if gds bo is created from user space, it must be
+			 * passed to bo list
+			 */
+			DRM_ERROR("GDS bo cannot be per-vm-bo\n");
+			return -EINVAL;
+		}
 		flags |= AMDGPU_GEM_CREATE_NO_CPU_ACCESS;
 		if (args->in.domains == AMDGPU_GEM_DOMAIN_GDS)
 			size = size << AMDGPU_GDS_SHIFT;
-- 
2.14.1

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

RE: [PATCH 1/2] drm/amdgpu: fix 'ISO C90 forbids mixed declarations'

[Deng, Emily]

Reviewed-by: Emily Deng <Emily.Deng@amd.com>

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf
> Of Chunming Zhou
> Sent: Wednesday, May 30, 2018 11:15 AM
> To: dri-devel@lists.freedesktop.org; amd-gfx@lists.freedesktop.org
> Cc: Deng, Emily <Emily.Deng@amd.com>; Zhou, David(ChunMing)
> <David1.Zhou@amd.com>
> Subject: [PATCH 1/2] drm/amdgpu: fix 'ISO C90 forbids mixed declarations'
> 
> Change-Id: I412f5783e2839c53841e6ab665f939236bdc5bf1
> Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> index 9ea8fb077aba..12f0d18c6ee8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> @@ -657,12 +657,12 @@ static int amdgpu_cs_parser_bos(struct
> amdgpu_cs_parser *p,
>  				     p->bytes_moved_vis);
> 
>  	if (p->bo_list) {
> -		gds = p->bo_list->gds_obj;
> -		gws = p->bo_list->gws_obj;
> -		oa = p->bo_list->oa_obj;
>  		struct amdgpu_vm *vm = &fpriv->vm;
>  		unsigned i;
> 
> +		gds = p->bo_list->gds_obj;
> +		gws = p->bo_list->gws_obj;
> +		oa = p->bo_list->oa_obj;
>  		for (i = 0; i < p->bo_list->num_entries; i++) {
>  			struct amdgpu_bo *bo = p->bo_list->array[i].robj;
> 
> --
> 2.14.1
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 1/2] drm/amdgpu: fix 'ISO C90 forbids mixed declarations'

[Christian König]

Please add something like "Fixing a compiler warning." as commit message.

With that done the series is Reviewed-by: Christian König 
<christian.koenig@amd.com>.

Thanks,
Christian.

Am 30.05.2018 um 05:14 schrieb Chunming Zhou:
> Change-Id: I412f5783e2839c53841e6ab665f939236bdc5bf1
> Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> index 9ea8fb077aba..12f0d18c6ee8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> @@ -657,12 +657,12 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
>   				     p->bytes_moved_vis);
>   
>   	if (p->bo_list) {
> -		gds = p->bo_list->gds_obj;
> -		gws = p->bo_list->gws_obj;
> -		oa = p->bo_list->oa_obj;
>   		struct amdgpu_vm *vm = &fpriv->vm;
>   		unsigned i;
>   
> +		gds = p->bo_list->gds_obj;
> +		gws = p->bo_list->gws_obj;
> +		oa = p->bo_list->oa_obj;
>   		for (i = 0; i < p->bo_list->num_entries; i++) {
>   			struct amdgpu_bo *bo = p->bo_list->array[i].robj;
>   

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel