* [PATCH 1/1] drm/amdgpu: clean up bo in vce and vcn test
@ 2020-12-08 15:55 Nirmoy Das
2020-12-08 17:39 ` Christian König
0 siblings, 1 reply; 10+ messages in thread
From: Nirmoy Das @ 2020-12-08 15:55 UTC (permalink / raw)
To: amd-gfx; +Cc: alexander.deucher, Nirmoy Das, Christian.Koenig
BO created with amdgpu_bo_create_reserved wasn't clean
properly before which causes:
[ 21.056218] WARNING: CPU: 0 PID: 7 at drivers/gpu/drm/ttm/ttm_bo.c:518 ttm_bo_release+0x2bf/0x310 [ttm]
<snip>
[ 21.056430] Call Trace:
[ 21.056525] amdgpu_bo_unref+0x1a/0x30 [amdgpu]
[ 21.056635] amdgpu_vcn_dec_send_msg+0x1b2/0x270 [amdgpu]
[ 21.056740] amdgpu_vcn_dec_get_create_msg.constprop.0+0xd8/0x100 [amdgpu]
[ 21.056843] amdgpu_vcn_dec_ring_test_ib+0x27/0x180 [amdgpu]
[ 21.056936] amdgpu_ib_ring_tests+0xf1/0x150 [amdgpu]
[ 21.057024] amdgpu_device_delayed_init_work_handler+0x11/0x30 [amdgpu]
[ 21.057030] process_one_work+0x1df/0x370
[ 21.057033] worker_thread+0x46/0x340
[ 21.057034] ? process_one_work+0x370/0x370
[ 21.057037] kthread+0x11b/0x140
[ 21.057039] ? __kthread_bind_mask+0x60/0x60
[ 21.057043] ret_from_fork+0x22/0x30
Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 16 ++++++++++------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index ecaa2d7483b2..78a4dd9bf11f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -1151,6 +1151,6 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout)
error:
dma_fence_put(fence);
amdgpu_bo_unreserve(bo);
- amdgpu_bo_unref(&bo);
+ amdgpu_bo_free_kernel(&bo, NULL, NULL);
return r;
}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index 7e19a6656715..dfcdd38ff9c2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -491,8 +491,6 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
goto err_free;
amdgpu_bo_fence(bo, f, false);
- amdgpu_bo_unreserve(bo);
- amdgpu_bo_unref(&bo);
if (fence)
*fence = dma_fence_get(f);
@@ -504,8 +502,6 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
amdgpu_job_free(job);
err:
- amdgpu_bo_unreserve(bo);
- amdgpu_bo_unref(&bo);
return r;
}
@@ -540,7 +536,11 @@ static int amdgpu_vcn_dec_get_create_msg(struct amdgpu_ring *ring, uint32_t hand
for (i = 14; i < 1024; ++i)
msg[i] = cpu_to_le32(0x0);
- return amdgpu_vcn_dec_send_msg(ring, bo, fence);
+ r = amdgpu_vcn_dec_send_msg(ring, bo, fence);
+ amdgpu_bo_unreserve(bo);
+ amdgpu_bo_free_kernel(&bo, NULL, (void **)&msg);
+
+ return r;
}
static int amdgpu_vcn_dec_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle,
@@ -566,7 +566,11 @@ static int amdgpu_vcn_dec_get_destroy_msg(struct amdgpu_ring *ring, uint32_t han
for (i = 6; i < 1024; ++i)
msg[i] = cpu_to_le32(0x0);
- return amdgpu_vcn_dec_send_msg(ring, bo, fence);
+ r = amdgpu_vcn_dec_send_msg(ring, bo, fence);
+ amdgpu_bo_unreserve(bo);
+ amdgpu_bo_free_kernel(&bo, NULL, (void **)&msg);
+
+ return r;
}
int amdgpu_vcn_dec_ring_test_ib(struct amdgpu_ring *ring, long timeout)
--
2.29.2
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/1] drm/amdgpu: clean up bo in vce and vcn test
2020-12-08 15:55 [PATCH 1/1] drm/amdgpu: clean up bo in vce and vcn test Nirmoy Das
@ 2020-12-08 17:39 ` Christian König
2020-12-08 18:59 ` [PATCH v2 " Nirmoy Das
0 siblings, 1 reply; 10+ messages in thread
From: Christian König @ 2020-12-08 17:39 UTC (permalink / raw)
To: Nirmoy Das, amd-gfx; +Cc: alexander.deucher, Christian.Koenig
Am 08.12.20 um 16:55 schrieb Nirmoy Das:
> BO created with amdgpu_bo_create_reserved wasn't clean
> properly before which causes:
I would rather like to keep the code as it is and just replace the
amdgpu_bo_unref() with amdgpu_bo_free_kernel().
But apart from that I think we can stick with this.
Christian.
>
> [ 21.056218] WARNING: CPU: 0 PID: 7 at drivers/gpu/drm/ttm/ttm_bo.c:518 ttm_bo_release+0x2bf/0x310 [ttm]
> <snip>
> [ 21.056430] Call Trace:
> [ 21.056525] amdgpu_bo_unref+0x1a/0x30 [amdgpu]
> [ 21.056635] amdgpu_vcn_dec_send_msg+0x1b2/0x270 [amdgpu]
> [ 21.056740] amdgpu_vcn_dec_get_create_msg.constprop.0+0xd8/0x100 [amdgpu]
> [ 21.056843] amdgpu_vcn_dec_ring_test_ib+0x27/0x180 [amdgpu]
> [ 21.056936] amdgpu_ib_ring_tests+0xf1/0x150 [amdgpu]
> [ 21.057024] amdgpu_device_delayed_init_work_handler+0x11/0x30 [amdgpu]
> [ 21.057030] process_one_work+0x1df/0x370
> [ 21.057033] worker_thread+0x46/0x340
> [ 21.057034] ? process_one_work+0x370/0x370
> [ 21.057037] kthread+0x11b/0x140
> [ 21.057039] ? __kthread_bind_mask+0x60/0x60
> [ 21.057043] ret_from_fork+0x22/0x30
>
> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 16 ++++++++++------
> 2 files changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> index ecaa2d7483b2..78a4dd9bf11f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> @@ -1151,6 +1151,6 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout)
> error:
> dma_fence_put(fence);
> amdgpu_bo_unreserve(bo);
> - amdgpu_bo_unref(&bo);
> + amdgpu_bo_free_kernel(&bo, NULL, NULL);
> return r;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> index 7e19a6656715..dfcdd38ff9c2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> @@ -491,8 +491,6 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
> goto err_free;
>
> amdgpu_bo_fence(bo, f, false);
> - amdgpu_bo_unreserve(bo);
> - amdgpu_bo_unref(&bo);
>
> if (fence)
> *fence = dma_fence_get(f);
> @@ -504,8 +502,6 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
> amdgpu_job_free(job);
>
> err:
> - amdgpu_bo_unreserve(bo);
> - amdgpu_bo_unref(&bo);
> return r;
> }
>
> @@ -540,7 +536,11 @@ static int amdgpu_vcn_dec_get_create_msg(struct amdgpu_ring *ring, uint32_t hand
> for (i = 14; i < 1024; ++i)
> msg[i] = cpu_to_le32(0x0);
>
> - return amdgpu_vcn_dec_send_msg(ring, bo, fence);
> + r = amdgpu_vcn_dec_send_msg(ring, bo, fence);
> + amdgpu_bo_unreserve(bo);
> + amdgpu_bo_free_kernel(&bo, NULL, (void **)&msg);
> +
> + return r;
> }
>
> static int amdgpu_vcn_dec_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle,
> @@ -566,7 +566,11 @@ static int amdgpu_vcn_dec_get_destroy_msg(struct amdgpu_ring *ring, uint32_t han
> for (i = 6; i < 1024; ++i)
> msg[i] = cpu_to_le32(0x0);
>
> - return amdgpu_vcn_dec_send_msg(ring, bo, fence);
> + r = amdgpu_vcn_dec_send_msg(ring, bo, fence);
> + amdgpu_bo_unreserve(bo);
> + amdgpu_bo_free_kernel(&bo, NULL, (void **)&msg);
> +
> + return r;
> }
>
> int amdgpu_vcn_dec_ring_test_ib(struct amdgpu_ring *ring, long timeout)
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 1/1] drm/amdgpu: clean up bo in vce and vcn test
2020-12-08 17:39 ` Christian König
@ 2020-12-08 18:59 ` Nirmoy Das
2020-12-08 19:04 ` Christian König
0 siblings, 1 reply; 10+ messages in thread
From: Nirmoy Das @ 2020-12-08 18:59 UTC (permalink / raw)
To: amd-gfx; +Cc: alexander.deucher, Nirmoy Das, Christian.Koenig
BO created with amdgpu_bo_create_reserved() wasn't clean
properly before, which causes:
[ 21.056218] WARNING: CPU: 0 PID: 7 at drivers/gpu/drm/ttm/ttm_bo.c:518 ttm_bo_release+0x2bf/0x310 [ttm]
<snip>
[ 21.056430] Call Trace:
[ 21.056525] amdgpu_bo_unref+0x1a/0x30 [amdgpu]
[ 21.056635] amdgpu_vcn_dec_send_msg+0x1b2/0x270 [amdgpu]
[ 21.056740] amdgpu_vcn_dec_get_create_msg.constprop.0+0xd8/0x100 [amdgpu]
[ 21.056843] amdgpu_vcn_dec_ring_test_ib+0x27/0x180 [amdgpu]
[ 21.056936] amdgpu_ib_ring_tests+0xf1/0x150 [amdgpu]
[ 21.057024] amdgpu_device_delayed_init_work_handler+0x11/0x30 [amdgpu]
[ 21.057030] process_one_work+0x1df/0x370
[ 21.057033] worker_thread+0x46/0x340
[ 21.057034] ? process_one_work+0x370/0x370
[ 21.057037] kthread+0x11b/0x140
[ 21.057039] ? __kthread_bind_mask+0x60/0x60
[ 21.057043] ret_from_fork+0x22/0x30
Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index ecaa2d7483b2..78a4dd9bf11f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -1151,6 +1151,6 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout)
error:
dma_fence_put(fence);
amdgpu_bo_unreserve(bo);
- amdgpu_bo_unref(&bo);
+ amdgpu_bo_free_kernel(&bo, NULL, NULL);
return r;
}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index 7e19a6656715..921b81054c1b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -465,6 +465,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
struct amdgpu_job *job;
struct amdgpu_ib *ib;
uint64_t addr;
+ void *msg = NULL;
int i, r;
r = amdgpu_job_alloc_with_ib(adev, 64,
@@ -474,6 +475,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
ib = &job->ibs[0];
addr = amdgpu_bo_gpu_offset(bo);
+ msg = amdgpu_bo_kptr(bo);
ib->ptr[0] = PACKET0(adev->vcn.internal.data0, 0);
ib->ptr[1] = addr;
ib->ptr[2] = PACKET0(adev->vcn.internal.data1, 0);
@@ -492,7 +494,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
amdgpu_bo_fence(bo, f, false);
amdgpu_bo_unreserve(bo);
- amdgpu_bo_unref(&bo);
+ amdgpu_bo_free_kernel(&bo, NULL, (void **)&msg);
if (fence)
*fence = dma_fence_get(f);
@@ -505,7 +507,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
err:
amdgpu_bo_unreserve(bo);
- amdgpu_bo_unref(&bo);
+ amdgpu_bo_free_kernel(&bo, NULL, (void **)&msg);
return r;
}
@@ -761,6 +763,7 @@ int amdgpu_vcn_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout)
error:
dma_fence_put(fence);
amdgpu_bo_unreserve(bo);
- amdgpu_bo_unref(&bo);
+ amdgpu_bo_free_kernel(&bo, NULL, NULL);
+
return r;
}
--
2.29.2
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2 1/1] drm/amdgpu: clean up bo in vce and vcn test
2020-12-08 18:59 ` [PATCH v2 " Nirmoy Das
@ 2020-12-08 19:04 ` Christian König
2020-12-08 19:39 ` Nirmoy
0 siblings, 1 reply; 10+ messages in thread
From: Christian König @ 2020-12-08 19:04 UTC (permalink / raw)
To: Nirmoy Das, amd-gfx; +Cc: alexander.deucher
Am 08.12.20 um 19:59 schrieb Nirmoy Das:
> BO created with amdgpu_bo_create_reserved() wasn't clean
> properly before, which causes:
>
> [ 21.056218] WARNING: CPU: 0 PID: 7 at drivers/gpu/drm/ttm/ttm_bo.c:518 ttm_bo_release+0x2bf/0x310 [ttm]
> <snip>
> [ 21.056430] Call Trace:
> [ 21.056525] amdgpu_bo_unref+0x1a/0x30 [amdgpu]
> [ 21.056635] amdgpu_vcn_dec_send_msg+0x1b2/0x270 [amdgpu]
> [ 21.056740] amdgpu_vcn_dec_get_create_msg.constprop.0+0xd8/0x100 [amdgpu]
> [ 21.056843] amdgpu_vcn_dec_ring_test_ib+0x27/0x180 [amdgpu]
> [ 21.056936] amdgpu_ib_ring_tests+0xf1/0x150 [amdgpu]
> [ 21.057024] amdgpu_device_delayed_init_work_handler+0x11/0x30 [amdgpu]
> [ 21.057030] process_one_work+0x1df/0x370
> [ 21.057033] worker_thread+0x46/0x340
> [ 21.057034] ? process_one_work+0x370/0x370
> [ 21.057037] kthread+0x11b/0x140
> [ 21.057039] ? __kthread_bind_mask+0x60/0x60
> [ 21.057043] ret_from_fork+0x22/0x30
>
> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
At some point we should probably switch to using an SA BO and stop this
mess here.
But for now the patch is Reviewed-by: Christian König
<christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 9 ++++++---
> 2 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> index ecaa2d7483b2..78a4dd9bf11f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> @@ -1151,6 +1151,6 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout)
> error:
> dma_fence_put(fence);
> amdgpu_bo_unreserve(bo);
> - amdgpu_bo_unref(&bo);
> + amdgpu_bo_free_kernel(&bo, NULL, NULL);
> return r;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> index 7e19a6656715..921b81054c1b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> @@ -465,6 +465,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
> struct amdgpu_job *job;
> struct amdgpu_ib *ib;
> uint64_t addr;
> + void *msg = NULL;
> int i, r;
>
> r = amdgpu_job_alloc_with_ib(adev, 64,
> @@ -474,6 +475,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
>
> ib = &job->ibs[0];
> addr = amdgpu_bo_gpu_offset(bo);
> + msg = amdgpu_bo_kptr(bo);
> ib->ptr[0] = PACKET0(adev->vcn.internal.data0, 0);
> ib->ptr[1] = addr;
> ib->ptr[2] = PACKET0(adev->vcn.internal.data1, 0);
> @@ -492,7 +494,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
>
> amdgpu_bo_fence(bo, f, false);
> amdgpu_bo_unreserve(bo);
> - amdgpu_bo_unref(&bo);
> + amdgpu_bo_free_kernel(&bo, NULL, (void **)&msg);
>
> if (fence)
> *fence = dma_fence_get(f);
> @@ -505,7 +507,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
>
> err:
> amdgpu_bo_unreserve(bo);
> - amdgpu_bo_unref(&bo);
> + amdgpu_bo_free_kernel(&bo, NULL, (void **)&msg);
> return r;
> }
>
> @@ -761,6 +763,7 @@ int amdgpu_vcn_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout)
> error:
> dma_fence_put(fence);
> amdgpu_bo_unreserve(bo);
> - amdgpu_bo_unref(&bo);
> + amdgpu_bo_free_kernel(&bo, NULL, NULL);
> +
> return r;
> }
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 1/1] drm/amdgpu: clean up bo in vce and vcn test
2020-12-08 19:04 ` Christian König
@ 2020-12-08 19:39 ` Nirmoy
2020-12-17 14:25 ` Christian König
0 siblings, 1 reply; 10+ messages in thread
From: Nirmoy @ 2020-12-08 19:39 UTC (permalink / raw)
To: Christian König, Nirmoy Das, amd-gfx; +Cc: alexander.deucher
On 12/8/20 8:04 PM, Christian König wrote:
> Am 08.12.20 um 19:59 schrieb Nirmoy Das:
>> BO created with amdgpu_bo_create_reserved() wasn't clean
>> properly before, which causes:
>>
>> [ 21.056218] WARNING: CPU: 0 PID: 7 at
>> drivers/gpu/drm/ttm/ttm_bo.c:518 ttm_bo_release+0x2bf/0x310 [ttm]
>> <snip>
>> [ 21.056430] Call Trace:
>> [ 21.056525] amdgpu_bo_unref+0x1a/0x30 [amdgpu]
>> [ 21.056635] amdgpu_vcn_dec_send_msg+0x1b2/0x270 [amdgpu]
>> [ 21.056740] amdgpu_vcn_dec_get_create_msg.constprop.0+0xd8/0x100
>> [amdgpu]
>> [ 21.056843] amdgpu_vcn_dec_ring_test_ib+0x27/0x180 [amdgpu]
>> [ 21.056936] amdgpu_ib_ring_tests+0xf1/0x150 [amdgpu]
>> [ 21.057024] amdgpu_device_delayed_init_work_handler+0x11/0x30
>> [amdgpu]
>> [ 21.057030] process_one_work+0x1df/0x370
>> [ 21.057033] worker_thread+0x46/0x340
>> [ 21.057034] ? process_one_work+0x370/0x370
>> [ 21.057037] kthread+0x11b/0x140
>> [ 21.057039] ? __kthread_bind_mask+0x60/0x60
>> [ 21.057043] ret_from_fork+0x22/0x30
>>
>> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
>
> At some point we should probably switch to using an SA BO and stop
> this mess here.
I will look into this.
>
> But for now the patch is Reviewed-by: Christian König
> <christian.koenig@amd.com>
Thanks,
Nirmoy
>
>> ---
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +-
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 9 ++++++---
>> 2 files changed, 7 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
>> index ecaa2d7483b2..78a4dd9bf11f 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
>> @@ -1151,6 +1151,6 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring
>> *ring, long timeout)
>> error:
>> dma_fence_put(fence);
>> amdgpu_bo_unreserve(bo);
>> - amdgpu_bo_unref(&bo);
>> + amdgpu_bo_free_kernel(&bo, NULL, NULL);
>> return r;
>> }
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>> index 7e19a6656715..921b81054c1b 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>> @@ -465,6 +465,7 @@ static int amdgpu_vcn_dec_send_msg(struct
>> amdgpu_ring *ring,
>> struct amdgpu_job *job;
>> struct amdgpu_ib *ib;
>> uint64_t addr;
>> + void *msg = NULL;
>> int i, r;
>> r = amdgpu_job_alloc_with_ib(adev, 64,
>> @@ -474,6 +475,7 @@ static int amdgpu_vcn_dec_send_msg(struct
>> amdgpu_ring *ring,
>> ib = &job->ibs[0];
>> addr = amdgpu_bo_gpu_offset(bo);
>> + msg = amdgpu_bo_kptr(bo);
>> ib->ptr[0] = PACKET0(adev->vcn.internal.data0, 0);
>> ib->ptr[1] = addr;
>> ib->ptr[2] = PACKET0(adev->vcn.internal.data1, 0);
>> @@ -492,7 +494,7 @@ static int amdgpu_vcn_dec_send_msg(struct
>> amdgpu_ring *ring,
>> amdgpu_bo_fence(bo, f, false);
>> amdgpu_bo_unreserve(bo);
>> - amdgpu_bo_unref(&bo);
>> + amdgpu_bo_free_kernel(&bo, NULL, (void **)&msg);
>> if (fence)
>> *fence = dma_fence_get(f);
>> @@ -505,7 +507,7 @@ static int amdgpu_vcn_dec_send_msg(struct
>> amdgpu_ring *ring,
>> err:
>> amdgpu_bo_unreserve(bo);
>> - amdgpu_bo_unref(&bo);
>> + amdgpu_bo_free_kernel(&bo, NULL, (void **)&msg);
>> return r;
>> }
>> @@ -761,6 +763,7 @@ int amdgpu_vcn_enc_ring_test_ib(struct
>> amdgpu_ring *ring, long timeout)
>> error:
>> dma_fence_put(fence);
>> amdgpu_bo_unreserve(bo);
>> - amdgpu_bo_unref(&bo);
>> + amdgpu_bo_free_kernel(&bo, NULL, NULL);
>> +
>> return r;
>> }
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 1/1] drm/amdgpu: clean up bo in vce and vcn test
2020-12-08 19:39 ` Nirmoy
@ 2020-12-17 14:25 ` Christian König
2020-12-18 10:57 ` Nirmoy
0 siblings, 1 reply; 10+ messages in thread
From: Christian König @ 2020-12-17 14:25 UTC (permalink / raw)
To: Nirmoy, Christian König, Nirmoy Das, amd-gfx; +Cc: alexander.deucher
Am 08.12.20 um 20:39 schrieb Nirmoy:
>
> On 12/8/20 8:04 PM, Christian König wrote:
>> Am 08.12.20 um 19:59 schrieb Nirmoy Das:
>>> BO created with amdgpu_bo_create_reserved() wasn't clean
>>> properly before, which causes:
>>>
>>> [ 21.056218] WARNING: CPU: 0 PID: 7 at
>>> drivers/gpu/drm/ttm/ttm_bo.c:518 ttm_bo_release+0x2bf/0x310 [ttm]
>>> <snip>
>>> [ 21.056430] Call Trace:
>>> [ 21.056525] amdgpu_bo_unref+0x1a/0x30 [amdgpu]
>>> [ 21.056635] amdgpu_vcn_dec_send_msg+0x1b2/0x270 [amdgpu]
>>> [ 21.056740] amdgpu_vcn_dec_get_create_msg.constprop.0+0xd8/0x100
>>> [amdgpu]
>>> [ 21.056843] amdgpu_vcn_dec_ring_test_ib+0x27/0x180 [amdgpu]
>>> [ 21.056936] amdgpu_ib_ring_tests+0xf1/0x150 [amdgpu]
>>> [ 21.057024] amdgpu_device_delayed_init_work_handler+0x11/0x30
>>> [amdgpu]
>>> [ 21.057030] process_one_work+0x1df/0x370
>>> [ 21.057033] worker_thread+0x46/0x340
>>> [ 21.057034] ? process_one_work+0x370/0x370
>>> [ 21.057037] kthread+0x11b/0x140
>>> [ 21.057039] ? __kthread_bind_mask+0x60/0x60
>>> [ 21.057043] ret_from_fork+0x22/0x30
>>>
>>> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
>>
>> At some point we should probably switch to using an SA BO and stop
>> this mess here.
>
>
> I will look into this.
Please leave me a note when you can do this since we stumbled into
problems with that.
Thanks,
Christian.
>> But for now the patch is Reviewed-by: Christian König
>> <christian.koenig@amd.com>
>
> Thanks,
>
> Nirmoy
>
>>
>>> ---
>>> drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +-
>>> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 9 ++++++---
>>> 2 files changed, 7 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
>>> index ecaa2d7483b2..78a4dd9bf11f 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
>>> @@ -1151,6 +1151,6 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring
>>> *ring, long timeout)
>>> error:
>>> dma_fence_put(fence);
>>> amdgpu_bo_unreserve(bo);
>>> - amdgpu_bo_unref(&bo);
>>> + amdgpu_bo_free_kernel(&bo, NULL, NULL);
>>> return r;
>>> }
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>>> index 7e19a6656715..921b81054c1b 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>>> @@ -465,6 +465,7 @@ static int amdgpu_vcn_dec_send_msg(struct
>>> amdgpu_ring *ring,
>>> struct amdgpu_job *job;
>>> struct amdgpu_ib *ib;
>>> uint64_t addr;
>>> + void *msg = NULL;
>>> int i, r;
>>> r = amdgpu_job_alloc_with_ib(adev, 64,
>>> @@ -474,6 +475,7 @@ static int amdgpu_vcn_dec_send_msg(struct
>>> amdgpu_ring *ring,
>>> ib = &job->ibs[0];
>>> addr = amdgpu_bo_gpu_offset(bo);
>>> + msg = amdgpu_bo_kptr(bo);
>>> ib->ptr[0] = PACKET0(adev->vcn.internal.data0, 0);
>>> ib->ptr[1] = addr;
>>> ib->ptr[2] = PACKET0(adev->vcn.internal.data1, 0);
>>> @@ -492,7 +494,7 @@ static int amdgpu_vcn_dec_send_msg(struct
>>> amdgpu_ring *ring,
>>> amdgpu_bo_fence(bo, f, false);
>>> amdgpu_bo_unreserve(bo);
>>> - amdgpu_bo_unref(&bo);
>>> + amdgpu_bo_free_kernel(&bo, NULL, (void **)&msg);
>>> if (fence)
>>> *fence = dma_fence_get(f);
>>> @@ -505,7 +507,7 @@ static int amdgpu_vcn_dec_send_msg(struct
>>> amdgpu_ring *ring,
>>> err:
>>> amdgpu_bo_unreserve(bo);
>>> - amdgpu_bo_unref(&bo);
>>> + amdgpu_bo_free_kernel(&bo, NULL, (void **)&msg);
>>> return r;
>>> }
>>> @@ -761,6 +763,7 @@ int amdgpu_vcn_enc_ring_test_ib(struct
>>> amdgpu_ring *ring, long timeout)
>>> error:
>>> dma_fence_put(fence);
>>> amdgpu_bo_unreserve(bo);
>>> - amdgpu_bo_unref(&bo);
>>> + amdgpu_bo_free_kernel(&bo, NULL, NULL);
>>> +
>>> return r;
>>> }
>>
> _______________________________________________
> 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] 10+ messages in thread
* Re: [PATCH v2 1/1] drm/amdgpu: clean up bo in vce and vcn test
2020-12-17 14:25 ` Christian König
@ 2020-12-18 10:57 ` Nirmoy
0 siblings, 0 replies; 10+ messages in thread
From: Nirmoy @ 2020-12-18 10:57 UTC (permalink / raw)
To: christian.koenig, Nirmoy Das, amd-gfx; +Cc: alexander.deucher
Hi Christian,
On 12/17/20 3:25 PM, Christian König wrote:
> Am 08.12.20 um 20:39 schrieb Nirmoy:
>>
>> On 12/8/20 8:04 PM, Christian König wrote:
>>> Am 08.12.20 um 19:59 schrieb Nirmoy Das:
>>>> BO created with amdgpu_bo_create_reserved() wasn't clean
>>>> properly before, which causes:
>>>>
>>>> [ 21.056218] WARNING: CPU: 0 PID: 7 at
>>>> drivers/gpu/drm/ttm/ttm_bo.c:518 ttm_bo_release+0x2bf/0x310 [ttm]
>>>> <snip>
>>>> [ 21.056430] Call Trace:
>>>> [ 21.056525] amdgpu_bo_unref+0x1a/0x30 [amdgpu]
>>>> [ 21.056635] amdgpu_vcn_dec_send_msg+0x1b2/0x270 [amdgpu]
>>>> [ 21.056740] amdgpu_vcn_dec_get_create_msg.constprop.0+0xd8/0x100
>>>> [amdgpu]
>>>> [ 21.056843] amdgpu_vcn_dec_ring_test_ib+0x27/0x180 [amdgpu]
>>>> [ 21.056936] amdgpu_ib_ring_tests+0xf1/0x150 [amdgpu]
>>>> [ 21.057024] amdgpu_device_delayed_init_work_handler+0x11/0x30
>>>> [amdgpu]
>>>> [ 21.057030] process_one_work+0x1df/0x370
>>>> [ 21.057033] worker_thread+0x46/0x340
>>>> [ 21.057034] ? process_one_work+0x370/0x370
>>>> [ 21.057037] kthread+0x11b/0x140
>>>> [ 21.057039] ? __kthread_bind_mask+0x60/0x60
>>>> [ 21.057043] ret_from_fork+0x22/0x30
>>>>
>>>> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
>>>
>>> At some point we should probably switch to using an SA BO and stop
>>> this mess here.
>>
>>
>> I will look into this.
>
> Please leave me a note when you can do this since we stumbled into
> problems with that.
I should have a patch ready by today.
Regards,
Nirmoy
>
> Thanks,
> Christian.
>
>>> But for now the patch is Reviewed-by: Christian König
>>> <christian.koenig@amd.com>
>>
>> Thanks,
>>
>> Nirmoy
>>
>>>
>>>> ---
>>>> drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +-
>>>> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 9 ++++++---
>>>> 2 files changed, 7 insertions(+), 4 deletions(-)
>>>>
>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
>>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
>>>> index ecaa2d7483b2..78a4dd9bf11f 100644
>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
>>>> @@ -1151,6 +1151,6 @@ int amdgpu_vce_ring_test_ib(struct
>>>> amdgpu_ring *ring, long timeout)
>>>> error:
>>>> dma_fence_put(fence);
>>>> amdgpu_bo_unreserve(bo);
>>>> - amdgpu_bo_unref(&bo);
>>>> + amdgpu_bo_free_kernel(&bo, NULL, NULL);
>>>> return r;
>>>> }
>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>>>> index 7e19a6656715..921b81054c1b 100644
>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>>>> @@ -465,6 +465,7 @@ static int amdgpu_vcn_dec_send_msg(struct
>>>> amdgpu_ring *ring,
>>>> struct amdgpu_job *job;
>>>> struct amdgpu_ib *ib;
>>>> uint64_t addr;
>>>> + void *msg = NULL;
>>>> int i, r;
>>>> r = amdgpu_job_alloc_with_ib(adev, 64,
>>>> @@ -474,6 +475,7 @@ static int amdgpu_vcn_dec_send_msg(struct
>>>> amdgpu_ring *ring,
>>>> ib = &job->ibs[0];
>>>> addr = amdgpu_bo_gpu_offset(bo);
>>>> + msg = amdgpu_bo_kptr(bo);
>>>> ib->ptr[0] = PACKET0(adev->vcn.internal.data0, 0);
>>>> ib->ptr[1] = addr;
>>>> ib->ptr[2] = PACKET0(adev->vcn.internal.data1, 0);
>>>> @@ -492,7 +494,7 @@ static int amdgpu_vcn_dec_send_msg(struct
>>>> amdgpu_ring *ring,
>>>> amdgpu_bo_fence(bo, f, false);
>>>> amdgpu_bo_unreserve(bo);
>>>> - amdgpu_bo_unref(&bo);
>>>> + amdgpu_bo_free_kernel(&bo, NULL, (void **)&msg);
>>>> if (fence)
>>>> *fence = dma_fence_get(f);
>>>> @@ -505,7 +507,7 @@ static int amdgpu_vcn_dec_send_msg(struct
>>>> amdgpu_ring *ring,
>>>> err:
>>>> amdgpu_bo_unreserve(bo);
>>>> - amdgpu_bo_unref(&bo);
>>>> + amdgpu_bo_free_kernel(&bo, NULL, (void **)&msg);
>>>> return r;
>>>> }
>>>> @@ -761,6 +763,7 @@ int amdgpu_vcn_enc_ring_test_ib(struct
>>>> amdgpu_ring *ring, long timeout)
>>>> error:
>>>> dma_fence_put(fence);
>>>> amdgpu_bo_unreserve(bo);
>>>> - amdgpu_bo_unref(&bo);
>>>> + amdgpu_bo_free_kernel(&bo, NULL, NULL);
>>>> +
>>>> return r;
>>>> }
>>>
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx@lists.freedesktop.org
>> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7CNirmoy.Das%40amd.com%7Ce0c007c753584ec9271f08d8a2978c2c%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637438119068272629%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=3wAWBMd5vHn2UoEBdhtO6CvlI0hrdg7HsFnqAbg3Jng%3D&reserved=0
>>
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 1/1] drm/amdgpu: clean up bo in vce and vcn test
@ 2020-12-09 11:51 Nirmoy Das
2020-12-09 11:57 ` Nirmoy
0 siblings, 1 reply; 10+ messages in thread
From: Nirmoy Das @ 2020-12-09 11:51 UTC (permalink / raw)
To: dri-devel; +Cc: Nirmoy Das, Christian König
BO created with amdgpu_bo_create_reserved() wasn't clean
properly before, which causes:
[ 21.056218] WARNING: CPU: 0 PID: 7 at drivers/gpu/drm/ttm/ttm_bo.c:518 ttm_bo_release+0x2bf/0x310 [ttm]
<snip>
[ 21.056430] Call Trace:
[ 21.056525] amdgpu_bo_unref+0x1a/0x30 [amdgpu]
[ 21.056635] amdgpu_vcn_dec_send_msg+0x1b2/0x270 [amdgpu]
[ 21.056740] amdgpu_vcn_dec_get_create_msg.constprop.0+0xd8/0x100 [amdgpu]
[ 21.056843] amdgpu_vcn_dec_ring_test_ib+0x27/0x180 [amdgpu]
[ 21.056936] amdgpu_ib_ring_tests+0xf1/0x150 [amdgpu]
[ 21.057024] amdgpu_device_delayed_init_work_handler+0x11/0x30 [amdgpu]
[ 21.057030] process_one_work+0x1df/0x370
[ 21.057033] worker_thread+0x46/0x340
[ 21.057034] ? process_one_work+0x370/0x370
[ 21.057037] kthread+0x11b/0x140
[ 21.057039] ? __kthread_bind_mask+0x60/0x60
[ 21.057043] ret_from_fork+0x22/0x30
Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index ecaa2d7483b2..78a4dd9bf11f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -1151,6 +1151,6 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout)
error:
dma_fence_put(fence);
amdgpu_bo_unreserve(bo);
- amdgpu_bo_unref(&bo);
+ amdgpu_bo_free_kernel(&bo, NULL, NULL);
return r;
}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index 7e19a6656715..921b81054c1b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -465,6 +465,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
struct amdgpu_job *job;
struct amdgpu_ib *ib;
uint64_t addr;
+ void *msg = NULL;
int i, r;
r = amdgpu_job_alloc_with_ib(adev, 64,
@@ -474,6 +475,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
ib = &job->ibs[0];
addr = amdgpu_bo_gpu_offset(bo);
+ msg = amdgpu_bo_kptr(bo);
ib->ptr[0] = PACKET0(adev->vcn.internal.data0, 0);
ib->ptr[1] = addr;
ib->ptr[2] = PACKET0(adev->vcn.internal.data1, 0);
@@ -492,7 +494,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
amdgpu_bo_fence(bo, f, false);
amdgpu_bo_unreserve(bo);
- amdgpu_bo_unref(&bo);
+ amdgpu_bo_free_kernel(&bo, NULL, (void **)&msg);
if (fence)
*fence = dma_fence_get(f);
@@ -505,7 +507,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
err:
amdgpu_bo_unreserve(bo);
- amdgpu_bo_unref(&bo);
+ amdgpu_bo_free_kernel(&bo, NULL, (void **)&msg);
return r;
}
@@ -761,6 +763,7 @@ int amdgpu_vcn_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout)
error:
dma_fence_put(fence);
amdgpu_bo_unreserve(bo);
- amdgpu_bo_unref(&bo);
+ amdgpu_bo_free_kernel(&bo, NULL, NULL);
+
return r;
}
--
2.29.2
_______________________________________________
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
* Re: [PATCH v2 1/1] drm/amdgpu: clean up bo in vce and vcn test
2020-12-09 11:51 Nirmoy Das
@ 2020-12-09 11:57 ` Nirmoy
2020-12-09 12:56 ` Christian König
0 siblings, 1 reply; 10+ messages in thread
From: Nirmoy @ 2020-12-09 11:57 UTC (permalink / raw)
To: Nirmoy Das, dri-devel; +Cc: Christian.Koenig
Hi Christian,
Can you please pick this up for drm-misc-next?
Thanks,
Nirmoy
On 12/9/20 12:51 PM, Nirmoy Das wrote:
> BO created with amdgpu_bo_create_reserved() wasn't clean
> properly before, which causes:
>
> [ 21.056218] WARNING: CPU: 0 PID: 7 at drivers/gpu/drm/ttm/ttm_bo.c:518 ttm_bo_release+0x2bf/0x310 [ttm]
> <snip>
> [ 21.056430] Call Trace:
> [ 21.056525] amdgpu_bo_unref+0x1a/0x30 [amdgpu]
> [ 21.056635] amdgpu_vcn_dec_send_msg+0x1b2/0x270 [amdgpu]
> [ 21.056740] amdgpu_vcn_dec_get_create_msg.constprop.0+0xd8/0x100 [amdgpu]
> [ 21.056843] amdgpu_vcn_dec_ring_test_ib+0x27/0x180 [amdgpu]
> [ 21.056936] amdgpu_ib_ring_tests+0xf1/0x150 [amdgpu]
> [ 21.057024] amdgpu_device_delayed_init_work_handler+0x11/0x30 [amdgpu]
> [ 21.057030] process_one_work+0x1df/0x370
> [ 21.057033] worker_thread+0x46/0x340
> [ 21.057034] ? process_one_work+0x370/0x370
> [ 21.057037] kthread+0x11b/0x140
> [ 21.057039] ? __kthread_bind_mask+0x60/0x60
> [ 21.057043] ret_from_fork+0x22/0x30
>
> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
> Reviewed-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 9 ++++++---
> 2 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> index ecaa2d7483b2..78a4dd9bf11f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> @@ -1151,6 +1151,6 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout)
> error:
> dma_fence_put(fence);
> amdgpu_bo_unreserve(bo);
> - amdgpu_bo_unref(&bo);
> + amdgpu_bo_free_kernel(&bo, NULL, NULL);
> return r;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> index 7e19a6656715..921b81054c1b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> @@ -465,6 +465,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
> struct amdgpu_job *job;
> struct amdgpu_ib *ib;
> uint64_t addr;
> + void *msg = NULL;
> int i, r;
>
> r = amdgpu_job_alloc_with_ib(adev, 64,
> @@ -474,6 +475,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
>
> ib = &job->ibs[0];
> addr = amdgpu_bo_gpu_offset(bo);
> + msg = amdgpu_bo_kptr(bo);
> ib->ptr[0] = PACKET0(adev->vcn.internal.data0, 0);
> ib->ptr[1] = addr;
> ib->ptr[2] = PACKET0(adev->vcn.internal.data1, 0);
> @@ -492,7 +494,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
>
> amdgpu_bo_fence(bo, f, false);
> amdgpu_bo_unreserve(bo);
> - amdgpu_bo_unref(&bo);
> + amdgpu_bo_free_kernel(&bo, NULL, (void **)&msg);
>
> if (fence)
> *fence = dma_fence_get(f);
> @@ -505,7 +507,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
>
> err:
> amdgpu_bo_unreserve(bo);
> - amdgpu_bo_unref(&bo);
> + amdgpu_bo_free_kernel(&bo, NULL, (void **)&msg);
> return r;
> }
>
> @@ -761,6 +763,7 @@ int amdgpu_vcn_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout)
> error:
> dma_fence_put(fence);
> amdgpu_bo_unreserve(bo);
> - amdgpu_bo_unref(&bo);
> + amdgpu_bo_free_kernel(&bo, NULL, NULL);
> +
> return r;
> }
> --
> 2.29.2
>
_______________________________________________
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
* Re: [PATCH v2 1/1] drm/amdgpu: clean up bo in vce and vcn test
2020-12-09 11:57 ` Nirmoy
@ 2020-12-09 12:56 ` Christian König
0 siblings, 0 replies; 10+ messages in thread
From: Christian König @ 2020-12-09 12:56 UTC (permalink / raw)
To: Nirmoy, Nirmoy Das, dri-devel
Hi Nirmoy,
oh, ok sure. I was thinking to merge it through amd-staging-drm-next
instead, but going through drm-misc-next is even better.
Regards,
Christian.
Am 09.12.20 um 12:57 schrieb Nirmoy:
> Hi Christian,
>
>
> Can you please pick this up for drm-misc-next?
>
>
> Thanks,
>
> Nirmoy
>
> On 12/9/20 12:51 PM, Nirmoy Das wrote:
>> BO created with amdgpu_bo_create_reserved() wasn't clean
>> properly before, which causes:
>>
>> [ 21.056218] WARNING: CPU: 0 PID: 7 at
>> drivers/gpu/drm/ttm/ttm_bo.c:518 ttm_bo_release+0x2bf/0x310 [ttm]
>> <snip>
>> [ 21.056430] Call Trace:
>> [ 21.056525] amdgpu_bo_unref+0x1a/0x30 [amdgpu]
>> [ 21.056635] amdgpu_vcn_dec_send_msg+0x1b2/0x270 [amdgpu]
>> [ 21.056740] amdgpu_vcn_dec_get_create_msg.constprop.0+0xd8/0x100
>> [amdgpu]
>> [ 21.056843] amdgpu_vcn_dec_ring_test_ib+0x27/0x180 [amdgpu]
>> [ 21.056936] amdgpu_ib_ring_tests+0xf1/0x150 [amdgpu]
>> [ 21.057024] amdgpu_device_delayed_init_work_handler+0x11/0x30
>> [amdgpu]
>> [ 21.057030] process_one_work+0x1df/0x370
>> [ 21.057033] worker_thread+0x46/0x340
>> [ 21.057034] ? process_one_work+0x370/0x370
>> [ 21.057037] kthread+0x11b/0x140
>> [ 21.057039] ? __kthread_bind_mask+0x60/0x60
>> [ 21.057043] ret_from_fork+0x22/0x30
>>
>> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
>> Reviewed-by: Christian König <christian.koenig@amd.com>
>> ---
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +-
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 9 ++++++---
>> 2 files changed, 7 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
>> index ecaa2d7483b2..78a4dd9bf11f 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
>> @@ -1151,6 +1151,6 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring
>> *ring, long timeout)
>> error:
>> dma_fence_put(fence);
>> amdgpu_bo_unreserve(bo);
>> - amdgpu_bo_unref(&bo);
>> + amdgpu_bo_free_kernel(&bo, NULL, NULL);
>> return r;
>> }
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>> index 7e19a6656715..921b81054c1b 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
>> @@ -465,6 +465,7 @@ static int amdgpu_vcn_dec_send_msg(struct
>> amdgpu_ring *ring,
>> struct amdgpu_job *job;
>> struct amdgpu_ib *ib;
>> uint64_t addr;
>> + void *msg = NULL;
>> int i, r;
>>
>> r = amdgpu_job_alloc_with_ib(adev, 64,
>> @@ -474,6 +475,7 @@ static int amdgpu_vcn_dec_send_msg(struct
>> amdgpu_ring *ring,
>>
>> ib = &job->ibs[0];
>> addr = amdgpu_bo_gpu_offset(bo);
>> + msg = amdgpu_bo_kptr(bo);
>> ib->ptr[0] = PACKET0(adev->vcn.internal.data0, 0);
>> ib->ptr[1] = addr;
>> ib->ptr[2] = PACKET0(adev->vcn.internal.data1, 0);
>> @@ -492,7 +494,7 @@ static int amdgpu_vcn_dec_send_msg(struct
>> amdgpu_ring *ring,
>>
>> amdgpu_bo_fence(bo, f, false);
>> amdgpu_bo_unreserve(bo);
>> - amdgpu_bo_unref(&bo);
>> + amdgpu_bo_free_kernel(&bo, NULL, (void **)&msg);
>>
>> if (fence)
>> *fence = dma_fence_get(f);
>> @@ -505,7 +507,7 @@ static int amdgpu_vcn_dec_send_msg(struct
>> amdgpu_ring *ring,
>>
>> err:
>> amdgpu_bo_unreserve(bo);
>> - amdgpu_bo_unref(&bo);
>> + amdgpu_bo_free_kernel(&bo, NULL, (void **)&msg);
>> return r;
>> }
>>
>> @@ -761,6 +763,7 @@ int amdgpu_vcn_enc_ring_test_ib(struct
>> amdgpu_ring *ring, long timeout)
>> error:
>> dma_fence_put(fence);
>> amdgpu_bo_unreserve(bo);
>> - amdgpu_bo_unref(&bo);
>> + amdgpu_bo_free_kernel(&bo, NULL, NULL);
>> +
>> return r;
>> }
>> --
>> 2.29.2
>>
_______________________________________________
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
end of thread, other threads:[~2020-12-18 10:57 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-08 15:55 [PATCH 1/1] drm/amdgpu: clean up bo in vce and vcn test Nirmoy Das
2020-12-08 17:39 ` Christian König
2020-12-08 18:59 ` [PATCH v2 " Nirmoy Das
2020-12-08 19:04 ` Christian König
2020-12-08 19:39 ` Nirmoy
2020-12-17 14:25 ` Christian König
2020-12-18 10:57 ` Nirmoy
2020-12-09 11:51 Nirmoy Das
2020-12-09 11:57 ` Nirmoy
2020-12-09 12:56 ` 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.