* [PATCH 1/1] drm/amdgpu: make BO type check less restrictive
@ 2021-03-15 15:14 Nirmoy Das
2021-03-15 15:22 ` Christian König
0 siblings, 1 reply; 3+ messages in thread
From: Nirmoy Das @ 2021-03-15 15:14 UTC (permalink / raw)
To: Christian.Koenig; +Cc: Tom StDenis, Nirmoy Das, amd-gfx
BO with ttm_bo_type_sg type can also have tiling_flag and metadata.
So so BO type check for only ttm_bo_type_kernel.
Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
Reported-by: Tom StDenis <Tom.StDenis@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index ac0e1cd83858..fdf23e439b42 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -1167,7 +1167,7 @@ int amdgpu_bo_set_tiling_flags(struct amdgpu_bo *bo, u64 tiling_flags)
struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
struct amdgpu_bo_user *ubo;
- BUG_ON(bo->tbo.type != ttm_bo_type_device);
+ BUG_ON(bo->tbo.type == ttm_bo_type_kernel);
if (adev->family <= AMDGPU_FAMILY_CZ &&
AMDGPU_TILING_GET(tiling_flags, TILE_SPLIT) > 6)
return -EINVAL;
@@ -1189,7 +1189,7 @@ void amdgpu_bo_get_tiling_flags(struct amdgpu_bo *bo, u64 *tiling_flags)
{
struct amdgpu_bo_user *ubo;
- BUG_ON(bo->tbo.type != ttm_bo_type_device);
+ BUG_ON(bo->tbo.type == ttm_bo_type_kernel);
dma_resv_assert_held(bo->tbo.base.resv);
ubo = to_amdgpu_bo_user(bo);
@@ -1216,7 +1216,7 @@ int amdgpu_bo_set_metadata (struct amdgpu_bo *bo, void *metadata,
struct amdgpu_bo_user *ubo;
void *buffer;
- BUG_ON(bo->tbo.type != ttm_bo_type_device);
+ BUG_ON(bo->tbo.type == ttm_bo_type_kernel);
ubo = to_amdgpu_bo_user(bo);
if (!metadata_size) {
if (ubo->metadata_size) {
@@ -1266,7 +1266,7 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo, void *buffer,
if (!buffer && !metadata_size)
return -EINVAL;
- BUG_ON(bo->tbo.type != ttm_bo_type_device);
+ BUG_ON(bo->tbo.type == ttm_bo_type_kernel);
ubo = to_amdgpu_bo_user(bo);
if (buffer) {
if (buffer_size < ubo->metadata_size)
--
2.30.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 1/1] drm/amdgpu: make BO type check less restrictive
2021-03-15 15:14 [PATCH 1/1] drm/amdgpu: make BO type check less restrictive Nirmoy Das
@ 2021-03-15 15:22 ` Christian König
2021-03-15 17:03 ` StDenis, Tom
0 siblings, 1 reply; 3+ messages in thread
From: Christian König @ 2021-03-15 15:22 UTC (permalink / raw)
To: Nirmoy Das; +Cc: Tom StDenis, amd-gfx
Am 15.03.21 um 16:14 schrieb Nirmoy Das:
> BO with ttm_bo_type_sg type can also have tiling_flag and metadata.
> So so BO type check for only ttm_bo_type_kernel.
>
> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
> Reported-by: Tom StDenis <Tom.StDenis@amd.com>
At some point we should probably add a amdgpu_bo_is_user() helper
function, but for now that should work.
Reviewed-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> index ac0e1cd83858..fdf23e439b42 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> @@ -1167,7 +1167,7 @@ int amdgpu_bo_set_tiling_flags(struct amdgpu_bo *bo, u64 tiling_flags)
> struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
> struct amdgpu_bo_user *ubo;
>
> - BUG_ON(bo->tbo.type != ttm_bo_type_device);
> + BUG_ON(bo->tbo.type == ttm_bo_type_kernel);
> if (adev->family <= AMDGPU_FAMILY_CZ &&
> AMDGPU_TILING_GET(tiling_flags, TILE_SPLIT) > 6)
> return -EINVAL;
> @@ -1189,7 +1189,7 @@ void amdgpu_bo_get_tiling_flags(struct amdgpu_bo *bo, u64 *tiling_flags)
> {
> struct amdgpu_bo_user *ubo;
>
> - BUG_ON(bo->tbo.type != ttm_bo_type_device);
> + BUG_ON(bo->tbo.type == ttm_bo_type_kernel);
> dma_resv_assert_held(bo->tbo.base.resv);
> ubo = to_amdgpu_bo_user(bo);
>
> @@ -1216,7 +1216,7 @@ int amdgpu_bo_set_metadata (struct amdgpu_bo *bo, void *metadata,
> struct amdgpu_bo_user *ubo;
> void *buffer;
>
> - BUG_ON(bo->tbo.type != ttm_bo_type_device);
> + BUG_ON(bo->tbo.type == ttm_bo_type_kernel);
> ubo = to_amdgpu_bo_user(bo);
> if (!metadata_size) {
> if (ubo->metadata_size) {
> @@ -1266,7 +1266,7 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo, void *buffer,
> if (!buffer && !metadata_size)
> return -EINVAL;
>
> - BUG_ON(bo->tbo.type != ttm_bo_type_device);
> + BUG_ON(bo->tbo.type == ttm_bo_type_kernel);
> ubo = to_amdgpu_bo_user(bo);
> if (buffer) {
> if (buffer_size < ubo->metadata_size)
_______________________________________________
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 1/1] drm/amdgpu: make BO type check less restrictive
2021-03-15 15:22 ` Christian König
@ 2021-03-15 17:03 ` StDenis, Tom
0 siblings, 0 replies; 3+ messages in thread
From: StDenis, Tom @ 2021-03-15 17:03 UTC (permalink / raw)
To: Koenig, Christian, Das, Nirmoy; +Cc: amd-gfx
[AMD Official Use Only - Internal Distribution Only]
FWIW the patch seems to fix the issue I was seeing :-)
Tom
________________________________________
From: Koenig, Christian <Christian.Koenig@amd.com>
Sent: Monday, March 15, 2021 11:22
To: Das, Nirmoy
Cc: amd-gfx@lists.freedesktop.org; StDenis, Tom
Subject: Re: [PATCH 1/1] drm/amdgpu: make BO type check less restrictive
Am 15.03.21 um 16:14 schrieb Nirmoy Das:
> BO with ttm_bo_type_sg type can also have tiling_flag and metadata.
> So so BO type check for only ttm_bo_type_kernel.
>
> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
> Reported-by: Tom StDenis <Tom.StDenis@amd.com>
At some point we should probably add a amdgpu_bo_is_user() helper
function, but for now that should work.
Reviewed-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> index ac0e1cd83858..fdf23e439b42 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> @@ -1167,7 +1167,7 @@ int amdgpu_bo_set_tiling_flags(struct amdgpu_bo *bo, u64 tiling_flags)
> struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
> struct amdgpu_bo_user *ubo;
>
> - BUG_ON(bo->tbo.type != ttm_bo_type_device);
> + BUG_ON(bo->tbo.type == ttm_bo_type_kernel);
> if (adev->family <= AMDGPU_FAMILY_CZ &&
> AMDGPU_TILING_GET(tiling_flags, TILE_SPLIT) > 6)
> return -EINVAL;
> @@ -1189,7 +1189,7 @@ void amdgpu_bo_get_tiling_flags(struct amdgpu_bo *bo, u64 *tiling_flags)
> {
> struct amdgpu_bo_user *ubo;
>
> - BUG_ON(bo->tbo.type != ttm_bo_type_device);
> + BUG_ON(bo->tbo.type == ttm_bo_type_kernel);
> dma_resv_assert_held(bo->tbo.base.resv);
> ubo = to_amdgpu_bo_user(bo);
>
> @@ -1216,7 +1216,7 @@ int amdgpu_bo_set_metadata (struct amdgpu_bo *bo, void *metadata,
> struct amdgpu_bo_user *ubo;
> void *buffer;
>
> - BUG_ON(bo->tbo.type != ttm_bo_type_device);
> + BUG_ON(bo->tbo.type == ttm_bo_type_kernel);
> ubo = to_amdgpu_bo_user(bo);
> if (!metadata_size) {
> if (ubo->metadata_size) {
> @@ -1266,7 +1266,7 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo, void *buffer,
> if (!buffer && !metadata_size)
> return -EINVAL;
>
> - BUG_ON(bo->tbo.type != ttm_bo_type_device);
> + BUG_ON(bo->tbo.type == ttm_bo_type_kernel);
> ubo = to_amdgpu_bo_user(bo);
> if (buffer) {
> if (buffer_size < ubo->metadata_size)
_______________________________________________
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:[~2021-03-15 17:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-15 15:14 [PATCH 1/1] drm/amdgpu: make BO type check less restrictive Nirmoy Das
2021-03-15 15:22 ` Christian König
2021-03-15 17:03 ` StDenis, Tom
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.