All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/amdgpu: correct evict flag for bo move
@ 2018-07-26 10:02 Junwei Zhang
       [not found] ` <1532599320-32343-1-git-send-email-Jerry.Zhang-5C7GfCeVMHo@public.gmane.org>
  0 siblings, 1 reply; 3+ messages in thread
From: Junwei Zhang @ 2018-07-26 10:02 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
  Cc: Junwei Zhang, christian.koenig-5C7GfCeVMHo

pass the evict flag instead of hard code

Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 8c4358e..c1ae528 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -580,7 +580,7 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, bool evict,
 	}
 
 	/* blit VRAM to GTT */
-	r = amdgpu_move_blit(bo, true, ctx->no_wait_gpu, &tmp_mem, old_mem);
+	r = amdgpu_move_blit(bo, evict, ctx->no_wait_gpu, &tmp_mem, old_mem);
 	if (unlikely(r)) {
 		goto out_cleanup;
 	}
@@ -632,7 +632,7 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo, bool evict,
 	}
 
 	/* copy to VRAM */
-	r = amdgpu_move_blit(bo, true, ctx->no_wait_gpu, new_mem, old_mem);
+	r = amdgpu_move_blit(bo, evict, ctx->no_wait_gpu, new_mem, old_mem);
 	if (unlikely(r)) {
 		goto out_cleanup;
 	}
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] drm/amdgpu: correct evict flag for bo move
       [not found] ` <1532599320-32343-1-git-send-email-Jerry.Zhang-5C7GfCeVMHo@public.gmane.org>
@ 2018-07-26 11:07   ` Christian König
       [not found]     ` <538a11a8-6cbb-0ab7-47f8-03e38f107b3b-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
  0 siblings, 1 reply; 3+ messages in thread
From: Christian König @ 2018-07-26 11:07 UTC (permalink / raw)
  To: Junwei Zhang, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
  Cc: christian.koenig-5C7GfCeVMHo

Am 26.07.2018 um 12:02 schrieb Junwei Zhang:
> pass the evict flag instead of hard code
>
> Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>

I can't come up with a reason why we shouldn't do this, but please test 
suspend/resume with this change just to be extra sure.

Apart from that patch is Reviewed-by: Christian König 
<christian.koenig@amd.com>.

Regards,
Christian

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 8c4358e..c1ae528 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -580,7 +580,7 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, bool evict,
>   	}
>   
>   	/* blit VRAM to GTT */
> -	r = amdgpu_move_blit(bo, true, ctx->no_wait_gpu, &tmp_mem, old_mem);
> +	r = amdgpu_move_blit(bo, evict, ctx->no_wait_gpu, &tmp_mem, old_mem);
>   	if (unlikely(r)) {
>   		goto out_cleanup;
>   	}
> @@ -632,7 +632,7 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo, bool evict,
>   	}
>   
>   	/* copy to VRAM */
> -	r = amdgpu_move_blit(bo, true, ctx->no_wait_gpu, new_mem, old_mem);
> +	r = amdgpu_move_blit(bo, evict, ctx->no_wait_gpu, new_mem, old_mem);
>   	if (unlikely(r)) {
>   		goto out_cleanup;
>   	}

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

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] drm/amdgpu: correct evict flag for bo move
       [not found]     ` <538a11a8-6cbb-0ab7-47f8-03e38f107b3b-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2018-07-27  0:53       ` Zhang, Jerry (Junwei)
  0 siblings, 0 replies; 3+ messages in thread
From: Zhang, Jerry (Junwei) @ 2018-07-27  0:53 UTC (permalink / raw)
  To: christian.koenig-5C7GfCeVMHo, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW

On 07/26/2018 07:07 PM, Christian König wrote:
> Am 26.07.2018 um 12:02 schrieb Junwei Zhang:
>> pass the evict flag instead of hard code
>>
>> Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
>
> I can't come up with a reason why we shouldn't do this, but please test suspend/resume with this change just to be extra sure.

Yes, already done test for S3

Regards,
Jerry

>
> Apart from that patch is Reviewed-by: Christian König <christian.koenig@amd.com>.
>
> Regards,
> Christian
>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>> index 8c4358e..c1ae528 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>> @@ -580,7 +580,7 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, bool evict,
>>       }
>>       /* blit VRAM to GTT */
>> -    r = amdgpu_move_blit(bo, true, ctx->no_wait_gpu, &tmp_mem, old_mem);
>> +    r = amdgpu_move_blit(bo, evict, ctx->no_wait_gpu, &tmp_mem, old_mem);
>>       if (unlikely(r)) {
>>           goto out_cleanup;
>>       }
>> @@ -632,7 +632,7 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo, bool evict,
>>       }
>>       /* copy to VRAM */
>> -    r = amdgpu_move_blit(bo, true, ctx->no_wait_gpu, new_mem, old_mem);
>> +    r = amdgpu_move_blit(bo, evict, ctx->no_wait_gpu, new_mem, old_mem);
>>       if (unlikely(r)) {
>>           goto out_cleanup;
>>       }
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-07-27  0:53 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-26 10:02 [PATCH] drm/amdgpu: correct evict flag for bo move Junwei Zhang
     [not found] ` <1532599320-32343-1-git-send-email-Jerry.Zhang-5C7GfCeVMHo@public.gmane.org>
2018-07-26 11:07   ` Christian König
     [not found]     ` <538a11a8-6cbb-0ab7-47f8-03e38f107b3b-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-07-27  0:53       ` Zhang, Jerry (Junwei)

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.