* [PATCH 1/2] drm/amdgpu: fix 'ISO C90 forbids mixed declarations'
@ 2018-05-30 3:14 Chunming Zhou
[not found] ` <20180530031447.27119-1-david1.zhou-5C7GfCeVMHo@public.gmane.org>
2018-05-30 6:37 ` Christian König
0 siblings, 2 replies; 4+ messages in thread
From: Chunming Zhou @ 2018-05-30 3:14 UTC (permalink / raw)
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Emily.Deng-5C7GfCeVMHo, 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] drm/amdgpu: gds bo must not be per-vm-bo
[not found] ` <20180530031447.27119-1-david1.zhou-5C7GfCeVMHo@public.gmane.org>
@ 2018-05-30 3:14 ` Chunming Zhou
2018-05-30 3:19 ` [PATCH 1/2] drm/amdgpu: fix 'ISO C90 forbids mixed declarations' Deng, Emily
1 sibling, 0 replies; 4+ messages in thread
From: Chunming Zhou @ 2018-05-30 3:14 UTC (permalink / raw)
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Emily.Deng-5C7GfCeVMHo, 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [PATCH 1/2] drm/amdgpu: fix 'ISO C90 forbids mixed declarations'
[not found] ` <20180530031447.27119-1-david1.zhou-5C7GfCeVMHo@public.gmane.org>
2018-05-30 3:14 ` [PATCH 2/2] drm/amdgpu: gds bo must not be per-vm-bo Chunming Zhou
@ 2018-05-30 3:19 ` Deng, Emily
1 sibling, 0 replies; 4+ messages in thread
From: Deng, Emily @ 2018-05-30 3:19 UTC (permalink / raw)
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Zhou, David(ChunMing)
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] drm/amdgpu: fix 'ISO C90 forbids mixed declarations'
2018-05-30 3:14 [PATCH 1/2] drm/amdgpu: fix 'ISO C90 forbids mixed declarations' Chunming Zhou
[not found] ` <20180530031447.27119-1-david1.zhou-5C7GfCeVMHo@public.gmane.org>
@ 2018-05-30 6:37 ` Christian König
1 sibling, 0 replies; 4+ messages in thread
From: Christian König @ 2018-05-30 6:37 UTC (permalink / raw)
To: Chunming Zhou, dri-devel, amd-gfx; +Cc: Emily.Deng
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-05-30 6:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-30 3:14 [PATCH 1/2] drm/amdgpu: fix 'ISO C90 forbids mixed declarations' Chunming Zhou
[not found] ` <20180530031447.27119-1-david1.zhou-5C7GfCeVMHo@public.gmane.org>
2018-05-30 3:14 ` [PATCH 2/2] drm/amdgpu: gds bo must not be per-vm-bo Chunming Zhou
2018-05-30 3:19 ` [PATCH 1/2] drm/amdgpu: fix 'ISO C90 forbids mixed declarations' Deng, Emily
2018-05-30 6:37 ` Christian König
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.