All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/1] drm/vmwgfx: free bo resource before assigning new one
@ 2021-06-08 15:09 Nirmoy Das
  2021-06-08 17:28 ` Christian König
  0 siblings, 1 reply; 10+ messages in thread
From: Nirmoy Das @ 2021-06-08 15:09 UTC (permalink / raw)
  To: dri-devel
  Cc: thomas_os, Nirmoy Das, linux-graphics-maintainer, Christian.Koenig

ttm_bo_assign_mem() expects bo->resource to be free.
Fixes: bfa3357ef9abc ("drm/ttm: allocate resource object instead of embedding it v2")

Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
---
 drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
index bfcf31bf7e37..7281912436bb 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
@@ -733,6 +733,7 @@ static int vmw_move(struct ttm_buffer_object *bo,
 
 	if (old_man->use_tt && new_man->use_tt) {
 		if (bo->resource->mem_type == TTM_PL_SYSTEM) {
+			ttm_resource_free(bo, &bo->resource);
 			ttm_bo_assign_mem(bo, new_mem);
 			return 0;
 		}
-- 
2.31.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/1] drm/vmwgfx: free bo resource before assigning new one
  2021-06-08 15:09 [PATCH 1/1] drm/vmwgfx: free bo resource before assigning new one Nirmoy Das
@ 2021-06-08 17:28 ` Christian König
  2021-06-08 17:54   ` Das, Nirmoy
                     ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: Christian König @ 2021-06-08 17:28 UTC (permalink / raw)
  To: Nirmoy Das, dri-devel; +Cc: thomas_os, linux-graphics-maintainer



Am 08.06.21 um 17:09 schrieb Nirmoy Das:
> ttm_bo_assign_mem() expects bo->resource to be free.
> Fixes: bfa3357ef9abc ("drm/ttm: allocate resource object instead of embedding it v2")
>
> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
> ---
>   drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
> index bfcf31bf7e37..7281912436bb 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
> @@ -733,6 +733,7 @@ static int vmw_move(struct ttm_buffer_object *bo,
>   
>   	if (old_man->use_tt && new_man->use_tt) {
>   		if (bo->resource->mem_type == TTM_PL_SYSTEM) {
> +			ttm_resource_free(bo, &bo->resource);
>   			ttm_bo_assign_mem(bo, new_mem);

On second thought we should probably use ttm_bo_move_null() instead here.

Christian.

>   			return 0;
>   		}


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/1] drm/vmwgfx: free bo resource before assigning new one
  2021-06-08 17:28 ` Christian König
@ 2021-06-08 17:54   ` Das, Nirmoy
  2021-06-08 18:01   ` Nirmoy Das
  2021-06-08 18:13   ` [PATCH 1/1] drm/vmwgfx: use ttm_bo_move_null() when there is nothing to move Nirmoy Das
  2 siblings, 0 replies; 10+ messages in thread
From: Das, Nirmoy @ 2021-06-08 17:54 UTC (permalink / raw)
  To: Christian König, dri-devel; +Cc: thomas_os, linux-graphics-maintainer


On 6/8/2021 7:28 PM, Christian König wrote:
>
>
> Am 08.06.21 um 17:09 schrieb Nirmoy Das:
>> ttm_bo_assign_mem() expects bo->resource to be free.
>> Fixes: bfa3357ef9abc ("drm/ttm: allocate resource object instead of 
>> embedding it v2")
>>
>> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
>> ---
>>   drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c 
>> b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
>> index bfcf31bf7e37..7281912436bb 100644
>> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
>> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
>> @@ -733,6 +733,7 @@ static int vmw_move(struct ttm_buffer_object *bo,
>>         if (old_man->use_tt && new_man->use_tt) {
>>           if (bo->resource->mem_type == TTM_PL_SYSTEM) {
>> +            ttm_resource_free(bo, &bo->resource);
>>               ttm_bo_assign_mem(bo, new_mem);
>
> On second thought we should probably use ttm_bo_move_null() instead here.


That reminds of 
https://patchwork.kernel.org/project/dri-devel/patch/20210503190013.91732-1-nirmoy.das@amd.com/ 
:)


>
> Christian.
>
>>               return 0;
>>           }
>

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH 1/1] drm/vmwgfx: free bo resource before assigning new one
  2021-06-08 17:28 ` Christian König
  2021-06-08 17:54   ` Das, Nirmoy
@ 2021-06-08 18:01   ` Nirmoy Das
  2021-06-08 18:05     ` Das, Nirmoy
  2021-06-08 18:13   ` [PATCH 1/1] drm/vmwgfx: use ttm_bo_move_null() when there is nothing to move Nirmoy Das
  2 siblings, 1 reply; 10+ messages in thread
From: Nirmoy Das @ 2021-06-08 18:01 UTC (permalink / raw)
  To: dri-devel
  Cc: thomas_os, Nirmoy Das, linux-graphics-maintainer, Christian.Koenig

ttm_bo_assign_mem() expects bo->resource to be free.
Fixes: bfa3357ef9abc ("drm/ttm: allocate resource object instead of embedding it v2")

Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
---
 drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
index bfcf31bf7e37..7281912436bb 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
@@ -733,6 +733,7 @@ static int vmw_move(struct ttm_buffer_object *bo,
 
 	if (old_man->use_tt && new_man->use_tt) {
 		if (bo->resource->mem_type == TTM_PL_SYSTEM) {
+			ttm_resource_free(bo, &bo->resource);
 			ttm_bo_assign_mem(bo, new_mem);
 			return 0;
 		}
-- 
2.31.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/1] drm/vmwgfx: free bo resource before assigning new one
  2021-06-08 18:01   ` Nirmoy Das
@ 2021-06-08 18:05     ` Das, Nirmoy
  0 siblings, 0 replies; 10+ messages in thread
From: Das, Nirmoy @ 2021-06-08 18:05 UTC (permalink / raw)
  To: dri-devel; +Cc: thomas_os, linux-graphics-maintainer, Christian.Koenig

Please ignore this,  I wanted to send 
https://patchwork.kernel.org/project/dri-devel/patch/20210503190013.91732-1-nirmoy.das@amd.com/

after rebase.

On 6/8/2021 8:01 PM, Nirmoy Das wrote:
> ttm_bo_assign_mem() expects bo->resource to be free.
> Fixes: bfa3357ef9abc ("drm/ttm: allocate resource object instead of embedding it v2")
>
> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
> ---
>   drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
> index bfcf31bf7e37..7281912436bb 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
> @@ -733,6 +733,7 @@ static int vmw_move(struct ttm_buffer_object *bo,
>   
>   	if (old_man->use_tt && new_man->use_tt) {
>   		if (bo->resource->mem_type == TTM_PL_SYSTEM) {
> +			ttm_resource_free(bo, &bo->resource);
>   			ttm_bo_assign_mem(bo, new_mem);
>   			return 0;
>   		}

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH 1/1] drm/vmwgfx: use ttm_bo_move_null() when there is nothing to move
  2021-06-08 17:28 ` Christian König
  2021-06-08 17:54   ` Das, Nirmoy
  2021-06-08 18:01   ` Nirmoy Das
@ 2021-06-08 18:13   ` Nirmoy Das
  2021-06-09  6:38     ` Christian König
  2 siblings, 1 reply; 10+ messages in thread
From: Nirmoy Das @ 2021-06-08 18:13 UTC (permalink / raw)
  To: dri-devel
  Cc: thomas_os, Nirmoy Das, linux-graphics-maintainer, Christian König

Use ttm_bo_move_null() instead of ttm_bo_assign_mem().

Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
index bfcf31bf7e37..0488042fb287 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
@@ -733,7 +733,7 @@ static int vmw_move(struct ttm_buffer_object *bo,
 
 	if (old_man->use_tt && new_man->use_tt) {
 		if (bo->resource->mem_type == TTM_PL_SYSTEM) {
-			ttm_bo_assign_mem(bo, new_mem);
+			ttm_bo_move_null(bo, new_mem);
 			return 0;
 		}
 		ret = ttm_bo_wait_ctx(bo, ctx);
-- 
2.31.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/1] drm/vmwgfx: use ttm_bo_move_null() when there is nothing to move
  2021-06-08 18:13   ` [PATCH 1/1] drm/vmwgfx: use ttm_bo_move_null() when there is nothing to move Nirmoy Das
@ 2021-06-09  6:38     ` Christian König
  2021-06-09  9:05       ` Das, Nirmoy
  0 siblings, 1 reply; 10+ messages in thread
From: Christian König @ 2021-06-09  6:38 UTC (permalink / raw)
  To: Nirmoy Das, dri-devel; +Cc: thomas_os, linux-graphics-maintainer

Am 08.06.21 um 20:13 schrieb Nirmoy Das:
> Use ttm_bo_move_null() instead of ttm_bo_assign_mem().
>
> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
> Reviewed-by: Christian König <christian.koenig@amd.com>

Looks like I've forgot to push that one. *sigh* I'm getting old.

Thanks,
Christian.

> ---
>   drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
> index bfcf31bf7e37..0488042fb287 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
> @@ -733,7 +733,7 @@ static int vmw_move(struct ttm_buffer_object *bo,
>   
>   	if (old_man->use_tt && new_man->use_tt) {
>   		if (bo->resource->mem_type == TTM_PL_SYSTEM) {
> -			ttm_bo_assign_mem(bo, new_mem);
> +			ttm_bo_move_null(bo, new_mem);
>   			return 0;
>   		}
>   		ret = ttm_bo_wait_ctx(bo, ctx);


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/1] drm/vmwgfx: use ttm_bo_move_null() when there is nothing to move
  2021-06-09  6:38     ` Christian König
@ 2021-06-09  9:05       ` Das, Nirmoy
  0 siblings, 0 replies; 10+ messages in thread
From: Das, Nirmoy @ 2021-06-09  9:05 UTC (permalink / raw)
  To: Christian König, dri-devel; +Cc: thomas_os, linux-graphics-maintainer


On 6/9/2021 8:38 AM, Christian König wrote:
> Am 08.06.21 um 20:13 schrieb Nirmoy Das:
>> Use ttm_bo_move_null() instead of ttm_bo_assign_mem().
>>
>> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
>> Reviewed-by: Christian König <christian.koenig@amd.com>
>
> Looks like I've forgot to push that one. *sigh* I'm getting old.


Nah, you have too many stuff on your plate. I should've pinged.


Regards,

Nirmoy


>
> Thanks,
> Christian.
>
>> ---
>>   drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c 
>> b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
>> index bfcf31bf7e37..0488042fb287 100644
>> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
>> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
>> @@ -733,7 +733,7 @@ static int vmw_move(struct ttm_buffer_object *bo,
>>         if (old_man->use_tt && new_man->use_tt) {
>>           if (bo->resource->mem_type == TTM_PL_SYSTEM) {
>> -            ttm_bo_assign_mem(bo, new_mem);
>> +            ttm_bo_move_null(bo, new_mem);
>>               return 0;
>>           }
>>           ret = ttm_bo_wait_ctx(bo, ctx);
>

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/1] drm/vmwgfx: use ttm_bo_move_null() when there is nothing to move
  2021-05-03 19:00 Nirmoy Das
@ 2021-05-03 19:02 ` Christian König
  0 siblings, 0 replies; 10+ messages in thread
From: Christian König @ 2021-05-03 19:02 UTC (permalink / raw)
  To: Nirmoy Das, dri-devel; +Cc: daniel.vetter, sroland

Am 03.05.21 um 21:00 schrieb Nirmoy Das:
> Use ttm_bo_move_null() instead of ttm_bo_assign_mem().
>
> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>

Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
>   drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
> index 2dc031fe4a90..beaf42f84f03 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
> @@ -738,7 +738,7 @@ static int vmw_move(struct ttm_buffer_object *bo,
>   
>   	if (old_man->use_tt && new_man->use_tt) {
>   		if (bo->mem.mem_type == TTM_PL_SYSTEM) {
> -			ttm_bo_assign_mem(bo, new_mem);
> +			ttm_bo_move_null(bo, new_mem);
>   			return 0;
>   		}
>   		ret = ttm_bo_wait_ctx(bo, ctx);

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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH 1/1] drm/vmwgfx: use ttm_bo_move_null() when there is nothing to move
@ 2021-05-03 19:00 Nirmoy Das
  2021-05-03 19:02 ` Christian König
  0 siblings, 1 reply; 10+ messages in thread
From: Nirmoy Das @ 2021-05-03 19:00 UTC (permalink / raw)
  To: dri-devel; +Cc: daniel.vetter, Nirmoy Das, sroland, Christian.Koenig

Use ttm_bo_move_null() instead of ttm_bo_assign_mem().

Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
---
 drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
index 2dc031fe4a90..beaf42f84f03 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
@@ -738,7 +738,7 @@ static int vmw_move(struct ttm_buffer_object *bo,
 
 	if (old_man->use_tt && new_man->use_tt) {
 		if (bo->mem.mem_type == TTM_PL_SYSTEM) {
-			ttm_bo_assign_mem(bo, new_mem);
+			ttm_bo_move_null(bo, new_mem);
 			return 0;
 		}
 		ret = ttm_bo_wait_ctx(bo, ctx);
-- 
2.31.1

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

^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2021-06-09  9:06 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-08 15:09 [PATCH 1/1] drm/vmwgfx: free bo resource before assigning new one Nirmoy Das
2021-06-08 17:28 ` Christian König
2021-06-08 17:54   ` Das, Nirmoy
2021-06-08 18:01   ` Nirmoy Das
2021-06-08 18:05     ` Das, Nirmoy
2021-06-08 18:13   ` [PATCH 1/1] drm/vmwgfx: use ttm_bo_move_null() when there is nothing to move Nirmoy Das
2021-06-09  6:38     ` Christian König
2021-06-09  9:05       ` Das, Nirmoy
  -- strict thread matches above, loose matches on Subject: below --
2021-05-03 19:00 Nirmoy Das
2021-05-03 19:02 ` 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.