* [PATCH 1/2] drm/amdgpu: remove pointless ttm_eu usage from vkms
@ 2022-04-19 14:19 Christian König
2022-04-19 14:19 ` [PATCH 2/2] drm/amdgpu: remove pointless ttm_eu usage from DM Christian König
2022-04-19 14:49 ` [PATCH 1/2] drm/amdgpu: remove pointless ttm_eu usage from vkms Alex Deucher
0 siblings, 2 replies; 8+ messages in thread
From: Christian König @ 2022-04-19 14:19 UTC (permalink / raw)
To: Ryan.Taylor, amd-gfx; +Cc: Christian König
We just need to reserve the BO here, no need for using ttm_eu.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 32 +++++++++++++-----------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
index 5224d9a39737..576849e95296 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
@@ -302,9 +302,6 @@ static int amdgpu_vkms_prepare_fb(struct drm_plane *plane,
struct drm_gem_object *obj;
struct amdgpu_device *adev;
struct amdgpu_bo *rbo;
- struct list_head list;
- struct ttm_validate_buffer tv;
- struct ww_acquire_ctx ticket;
uint32_t domain;
int r;
@@ -316,18 +313,19 @@ static int amdgpu_vkms_prepare_fb(struct drm_plane *plane,
obj = new_state->fb->obj[0];
rbo = gem_to_amdgpu_bo(obj);
adev = amdgpu_ttm_adev(rbo->tbo.bdev);
- INIT_LIST_HEAD(&list);
- tv.bo = &rbo->tbo;
- tv.num_shared = 1;
- list_add(&tv.head, &list);
-
- r = ttm_eu_reserve_buffers(&ticket, &list, false, NULL);
+ r = amdgpu_bo_reserve(rbo, true);
if (r) {
dev_err(adev->dev, "fail to reserve bo (%d)\n", r);
return r;
}
+ r = dma_resv_reserve_fences(rbo->tbo.base.resv, 1);
+ if (r) {
+ dev_err(adev->dev, "allocating fence slot failed (%d)\n", r);
+ goto error_unlock;
+ }
+
if (plane->type != DRM_PLANE_TYPE_CURSOR)
domain = amdgpu_display_supported_domains(adev, rbo->flags);
else
@@ -337,25 +335,29 @@ static int amdgpu_vkms_prepare_fb(struct drm_plane *plane,
if (unlikely(r != 0)) {
if (r != -ERESTARTSYS)
DRM_ERROR("Failed to pin framebuffer with error %d\n", r);
- ttm_eu_backoff_reservation(&ticket, &list);
- return r;
+ goto error_unlock;
}
r = amdgpu_ttm_alloc_gart(&rbo->tbo);
if (unlikely(r != 0)) {
- amdgpu_bo_unpin(rbo);
- ttm_eu_backoff_reservation(&ticket, &list);
DRM_ERROR("%p bind failed\n", rbo);
- return r;
+ goto error_unpin;
}
- ttm_eu_backoff_reservation(&ticket, &list);
+ amdgpu_bo_unreserve(rbo);
afb->address = amdgpu_bo_gpu_offset(rbo);
amdgpu_bo_ref(rbo);
return 0;
+
+error_unpin:
+ amdgpu_bo_unpin(rbo);
+
+error_unlock:
+ amdgpu_bo_unreserve(rbo);
+ return r;
}
static void amdgpu_vkms_cleanup_fb(struct drm_plane *plane,
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/2] drm/amdgpu: remove pointless ttm_eu usage from DM
2022-04-19 14:19 [PATCH 1/2] drm/amdgpu: remove pointless ttm_eu usage from vkms Christian König
@ 2022-04-19 14:19 ` Christian König
2022-04-19 14:37 ` Harry Wentland
2022-04-19 14:49 ` [PATCH 1/2] drm/amdgpu: remove pointless ttm_eu usage from vkms Alex Deucher
1 sibling, 1 reply; 8+ messages in thread
From: Christian König @ 2022-04-19 14:19 UTC (permalink / raw)
To: Ryan.Taylor, amd-gfx; +Cc: Christian König
We just need to reserve the BO here, no need for using ttm_eu.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 32 ++++++++++---------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 73423b805b54..91e9922b95b3 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -7583,9 +7583,6 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane,
struct amdgpu_device *adev;
struct amdgpu_bo *rbo;
struct dm_plane_state *dm_plane_state_new, *dm_plane_state_old;
- struct list_head list;
- struct ttm_validate_buffer tv;
- struct ww_acquire_ctx ticket;
uint32_t domain;
int r;
@@ -7598,18 +7595,19 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane,
obj = new_state->fb->obj[0];
rbo = gem_to_amdgpu_bo(obj);
adev = amdgpu_ttm_adev(rbo->tbo.bdev);
- INIT_LIST_HEAD(&list);
- tv.bo = &rbo->tbo;
- tv.num_shared = 1;
- list_add(&tv.head, &list);
-
- r = ttm_eu_reserve_buffers(&ticket, &list, false, NULL);
+ r = amdgpu_bo_reserve(rbo, true);
if (r) {
dev_err(adev->dev, "fail to reserve bo (%d)\n", r);
return r;
}
+ r = dma_resv_reserve_fences(rbo->tbo.base.resv, 1);
+ if (r) {
+ dev_err(adev->dev, "reserving fence slot failed (%d)\n", r);
+ goto error_unlock;
+ }
+
if (plane->type != DRM_PLANE_TYPE_CURSOR)
domain = amdgpu_display_supported_domains(adev, rbo->flags);
else
@@ -7619,19 +7617,16 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane,
if (unlikely(r != 0)) {
if (r != -ERESTARTSYS)
DRM_ERROR("Failed to pin framebuffer with error %d\n", r);
- ttm_eu_backoff_reservation(&ticket, &list);
- return r;
+ goto error_unlock;
}
r = amdgpu_ttm_alloc_gart(&rbo->tbo);
if (unlikely(r != 0)) {
- amdgpu_bo_unpin(rbo);
- ttm_eu_backoff_reservation(&ticket, &list);
DRM_ERROR("%p bind failed\n", rbo);
- return r;
+ goto error_unpin;
}
- ttm_eu_backoff_reservation(&ticket, &list);
+ amdgpu_bo_unreserve(rbo);
afb->address = amdgpu_bo_gpu_offset(rbo);
@@ -7663,6 +7658,13 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane,
}
return 0;
+
+error_unpin:
+ amdgpu_bo_unpin(rbo);
+
+error_unlock:
+ amdgpu_bo_unreserve(rbo);
+ return r;
}
static void dm_plane_helper_cleanup_fb(struct drm_plane *plane,
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 2/2] drm/amdgpu: remove pointless ttm_eu usage from DM
2022-04-19 14:19 ` [PATCH 2/2] drm/amdgpu: remove pointless ttm_eu usage from DM Christian König
@ 2022-04-19 14:37 ` Harry Wentland
2022-04-19 14:42 ` Christian König
0 siblings, 1 reply; 8+ messages in thread
From: Harry Wentland @ 2022-04-19 14:37 UTC (permalink / raw)
To: Christian König, Ryan.Taylor, amd-gfx; +Cc: Christian König
On 2022-04-19 10:19, Christian König wrote:
> We just need to reserve the BO here, no need for using ttm_eu.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Harry
> ---
> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 32 ++++++++++---------
> 1 file changed, 17 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 73423b805b54..91e9922b95b3 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -7583,9 +7583,6 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane,
> struct amdgpu_device *adev;
> struct amdgpu_bo *rbo;
> struct dm_plane_state *dm_plane_state_new, *dm_plane_state_old;
> - struct list_head list;
> - struct ttm_validate_buffer tv;
> - struct ww_acquire_ctx ticket;
> uint32_t domain;
> int r;
>
> @@ -7598,18 +7595,19 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane,
> obj = new_state->fb->obj[0];
> rbo = gem_to_amdgpu_bo(obj);
> adev = amdgpu_ttm_adev(rbo->tbo.bdev);
> - INIT_LIST_HEAD(&list);
>
> - tv.bo = &rbo->tbo;
> - tv.num_shared = 1;
> - list_add(&tv.head, &list);
> -
> - r = ttm_eu_reserve_buffers(&ticket, &list, false, NULL);
> + r = amdgpu_bo_reserve(rbo, true);
> if (r) {
> dev_err(adev->dev, "fail to reserve bo (%d)\n", r);
> return r;
> }
>
> + r = dma_resv_reserve_fences(rbo->tbo.base.resv, 1);
> + if (r) {
> + dev_err(adev->dev, "reserving fence slot failed (%d)\n", r);
> + goto error_unlock;
> + }
> +
> if (plane->type != DRM_PLANE_TYPE_CURSOR)
> domain = amdgpu_display_supported_domains(adev, rbo->flags);
> else
> @@ -7619,19 +7617,16 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane,
> if (unlikely(r != 0)) {
> if (r != -ERESTARTSYS)
> DRM_ERROR("Failed to pin framebuffer with error %d\n", r);
> - ttm_eu_backoff_reservation(&ticket, &list);
> - return r;
> + goto error_unlock;
> }
>
> r = amdgpu_ttm_alloc_gart(&rbo->tbo);
> if (unlikely(r != 0)) {
> - amdgpu_bo_unpin(rbo);
> - ttm_eu_backoff_reservation(&ticket, &list);
> DRM_ERROR("%p bind failed\n", rbo);
> - return r;
> + goto error_unpin;
> }
>
> - ttm_eu_backoff_reservation(&ticket, &list);
> + amdgpu_bo_unreserve(rbo);
>
> afb->address = amdgpu_bo_gpu_offset(rbo);
>
> @@ -7663,6 +7658,13 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane,
> }
>
> return 0;
> +
> +error_unpin:
> + amdgpu_bo_unpin(rbo);
> +
> +error_unlock:
> + amdgpu_bo_unreserve(rbo);
> + return r;
> }
>
> static void dm_plane_helper_cleanup_fb(struct drm_plane *plane,
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 2/2] drm/amdgpu: remove pointless ttm_eu usage from DM
2022-04-19 14:37 ` Harry Wentland
@ 2022-04-19 14:42 ` Christian König
2022-04-19 15:14 ` Harry Wentland
0 siblings, 1 reply; 8+ messages in thread
From: Christian König @ 2022-04-19 14:42 UTC (permalink / raw)
To: Harry Wentland, Christian König, Ryan.Taylor, amd-gfx
Am 19.04.22 um 16:37 schrieb Harry Wentland:
>
>
> On 2022-04-19 10:19, Christian König wrote:
>> We just need to reserve the BO here, no need for using ttm_eu.
>>
>> Signed-off-by: Christian König <christian.koenig@amd.com>
>
> Acked-by: Harry Wentland <harry.wentland@amd.com>
What about the second patch? Who takes care of amdgpu_vkms.c? You guys
or should I ping Alex?
Thanks,
Christian.
>
> Harry
>
>> ---
>> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 32 ++++++++++---------
>> 1 file changed, 17 insertions(+), 15 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> index 73423b805b54..91e9922b95b3 100644
>> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> @@ -7583,9 +7583,6 @@ static int dm_plane_helper_prepare_fb(struct
>> drm_plane *plane,
>> struct amdgpu_device *adev;
>> struct amdgpu_bo *rbo;
>> struct dm_plane_state *dm_plane_state_new, *dm_plane_state_old;
>> - struct list_head list;
>> - struct ttm_validate_buffer tv;
>> - struct ww_acquire_ctx ticket;
>> uint32_t domain;
>> int r;
>> @@ -7598,18 +7595,19 @@ static int
>> dm_plane_helper_prepare_fb(struct drm_plane *plane,
>> obj = new_state->fb->obj[0];
>> rbo = gem_to_amdgpu_bo(obj);
>> adev = amdgpu_ttm_adev(rbo->tbo.bdev);
>> - INIT_LIST_HEAD(&list);
>> - tv.bo = &rbo->tbo;
>> - tv.num_shared = 1;
>> - list_add(&tv.head, &list);
>> -
>> - r = ttm_eu_reserve_buffers(&ticket, &list, false, NULL);
>> + r = amdgpu_bo_reserve(rbo, true);
>> if (r) {
>> dev_err(adev->dev, "fail to reserve bo (%d)\n", r);
>> return r;
>> }
>> + r = dma_resv_reserve_fences(rbo->tbo.base.resv, 1);
>> + if (r) {
>> + dev_err(adev->dev, "reserving fence slot failed (%d)\n", r);
>> + goto error_unlock;
>> + }
>> +
>> if (plane->type != DRM_PLANE_TYPE_CURSOR)
>> domain = amdgpu_display_supported_domains(adev, rbo->flags);
>> else
>> @@ -7619,19 +7617,16 @@ static int dm_plane_helper_prepare_fb(struct
>> drm_plane *plane,
>> if (unlikely(r != 0)) {
>> if (r != -ERESTARTSYS)
>> DRM_ERROR("Failed to pin framebuffer with error %d\n", r);
>> - ttm_eu_backoff_reservation(&ticket, &list);
>> - return r;
>> + goto error_unlock;
>> }
>> r = amdgpu_ttm_alloc_gart(&rbo->tbo);
>> if (unlikely(r != 0)) {
>> - amdgpu_bo_unpin(rbo);
>> - ttm_eu_backoff_reservation(&ticket, &list);
>> DRM_ERROR("%p bind failed\n", rbo);
>> - return r;
>> + goto error_unpin;
>> }
>> - ttm_eu_backoff_reservation(&ticket, &list);
>> + amdgpu_bo_unreserve(rbo);
>> afb->address = amdgpu_bo_gpu_offset(rbo);
>> @@ -7663,6 +7658,13 @@ static int dm_plane_helper_prepare_fb(struct
>> drm_plane *plane,
>> }
>> return 0;
>> +
>> +error_unpin:
>> + amdgpu_bo_unpin(rbo);
>> +
>> +error_unlock:
>> + amdgpu_bo_unreserve(rbo);
>> + return r;
>> }
>> static void dm_plane_helper_cleanup_fb(struct drm_plane *plane,
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 2/2] drm/amdgpu: remove pointless ttm_eu usage from DM
2022-04-19 14:42 ` Christian König
@ 2022-04-19 15:14 ` Harry Wentland
0 siblings, 0 replies; 8+ messages in thread
From: Harry Wentland @ 2022-04-19 15:14 UTC (permalink / raw)
To: Christian König, Christian König, Ryan.Taylor, amd-gfx
On 2022-04-19 10:42, Christian König wrote:
> Am 19.04.22 um 16:37 schrieb Harry Wentland:
>>
>>
>> On 2022-04-19 10:19, Christian König wrote:
>>> We just need to reserve the BO here, no need for using ttm_eu.
>>>
>>> Signed-off-by: Christian König <christian.koenig@amd.com>
>>
>> Acked-by: Harry Wentland <harry.wentland@amd.com>
>
> What about the second patch? Who takes care of amdgpu_vkms.c? You guys
> or should I ping Alex?
>
We're not working with amdgpu_vkms. Looks like Alex already responded
to the other patch.
Harry
> Thanks,
> Christian.
>
>>
>> Harry
>>
>>> ---
>>> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 32 ++++++++++---------
>>> 1 file changed, 17 insertions(+), 15 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>>> b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>>> index 73423b805b54..91e9922b95b3 100644
>>> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>>> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>>> @@ -7583,9 +7583,6 @@ static int dm_plane_helper_prepare_fb(struct
>>> drm_plane *plane,
>>> struct amdgpu_device *adev;
>>> struct amdgpu_bo *rbo;
>>> struct dm_plane_state *dm_plane_state_new, *dm_plane_state_old;
>>> - struct list_head list;
>>> - struct ttm_validate_buffer tv;
>>> - struct ww_acquire_ctx ticket;
>>> uint32_t domain;
>>> int r;
>>> @@ -7598,18 +7595,19 @@ static int
>>> dm_plane_helper_prepare_fb(struct drm_plane *plane,
>>> obj = new_state->fb->obj[0];
>>> rbo = gem_to_amdgpu_bo(obj);
>>> adev = amdgpu_ttm_adev(rbo->tbo.bdev);
>>> - INIT_LIST_HEAD(&list);
>>> - tv.bo = &rbo->tbo;
>>> - tv.num_shared = 1;
>>> - list_add(&tv.head, &list);
>>> -
>>> - r = ttm_eu_reserve_buffers(&ticket, &list, false, NULL);
>>> + r = amdgpu_bo_reserve(rbo, true);
>>> if (r) {
>>> dev_err(adev->dev, "fail to reserve bo (%d)\n", r);
>>> return r;
>>> }
>>> + r = dma_resv_reserve_fences(rbo->tbo.base.resv, 1);
>>> + if (r) {
>>> + dev_err(adev->dev, "reserving fence slot failed (%d)\n", r);
>>> + goto error_unlock;
>>> + }
>>> +
>>> if (plane->type != DRM_PLANE_TYPE_CURSOR)
>>> domain = amdgpu_display_supported_domains(adev, rbo->flags);
>>> else
>>> @@ -7619,19 +7617,16 @@ static int dm_plane_helper_prepare_fb(struct
>>> drm_plane *plane,
>>> if (unlikely(r != 0)) {
>>> if (r != -ERESTARTSYS)
>>> DRM_ERROR("Failed to pin framebuffer with error %d\n", r);
>>> - ttm_eu_backoff_reservation(&ticket, &list);
>>> - return r;
>>> + goto error_unlock;
>>> }
>>> r = amdgpu_ttm_alloc_gart(&rbo->tbo);
>>> if (unlikely(r != 0)) {
>>> - amdgpu_bo_unpin(rbo);
>>> - ttm_eu_backoff_reservation(&ticket, &list);
>>> DRM_ERROR("%p bind failed\n", rbo);
>>> - return r;
>>> + goto error_unpin;
>>> }
>>> - ttm_eu_backoff_reservation(&ticket, &list);
>>> + amdgpu_bo_unreserve(rbo);
>>> afb->address = amdgpu_bo_gpu_offset(rbo);
>>> @@ -7663,6 +7658,13 @@ static int dm_plane_helper_prepare_fb(struct
>>> drm_plane *plane,
>>> }
>>> return 0;
>>> +
>>> +error_unpin:
>>> + amdgpu_bo_unpin(rbo);
>>> +
>>> +error_unlock:
>>> + amdgpu_bo_unreserve(rbo);
>>> + return r;
>>> }
>>> static void dm_plane_helper_cleanup_fb(struct drm_plane *plane,
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] drm/amdgpu: remove pointless ttm_eu usage from vkms
2022-04-19 14:19 [PATCH 1/2] drm/amdgpu: remove pointless ttm_eu usage from vkms Christian König
2022-04-19 14:19 ` [PATCH 2/2] drm/amdgpu: remove pointless ttm_eu usage from DM Christian König
@ 2022-04-19 14:49 ` Alex Deucher
2022-04-19 14:55 ` Christian König
1 sibling, 1 reply; 8+ messages in thread
From: Alex Deucher @ 2022-04-19 14:49 UTC (permalink / raw)
To: Christian König; +Cc: Ryan Taylor, amd-gfx list, Christian König
On Tue, Apr 19, 2022 at 10:19 AM Christian König
<ckoenig.leichtzumerken@gmail.com> wrote:
>
> We just need to reserve the BO here, no need for using ttm_eu.
Can you include a more detailed description as to why it's not
necessary? Most of this code was copied from radeon originally. Does
radeon need a similar cleanup?
Alex
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 32 +++++++++++++-----------
> 1 file changed, 17 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
> index 5224d9a39737..576849e95296 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
> @@ -302,9 +302,6 @@ static int amdgpu_vkms_prepare_fb(struct drm_plane *plane,
> struct drm_gem_object *obj;
> struct amdgpu_device *adev;
> struct amdgpu_bo *rbo;
> - struct list_head list;
> - struct ttm_validate_buffer tv;
> - struct ww_acquire_ctx ticket;
> uint32_t domain;
> int r;
>
> @@ -316,18 +313,19 @@ static int amdgpu_vkms_prepare_fb(struct drm_plane *plane,
> obj = new_state->fb->obj[0];
> rbo = gem_to_amdgpu_bo(obj);
> adev = amdgpu_ttm_adev(rbo->tbo.bdev);
> - INIT_LIST_HEAD(&list);
>
> - tv.bo = &rbo->tbo;
> - tv.num_shared = 1;
> - list_add(&tv.head, &list);
> -
> - r = ttm_eu_reserve_buffers(&ticket, &list, false, NULL);
> + r = amdgpu_bo_reserve(rbo, true);
> if (r) {
> dev_err(adev->dev, "fail to reserve bo (%d)\n", r);
> return r;
> }
>
> + r = dma_resv_reserve_fences(rbo->tbo.base.resv, 1);
> + if (r) {
> + dev_err(adev->dev, "allocating fence slot failed (%d)\n", r);
> + goto error_unlock;
> + }
> +
> if (plane->type != DRM_PLANE_TYPE_CURSOR)
> domain = amdgpu_display_supported_domains(adev, rbo->flags);
> else
> @@ -337,25 +335,29 @@ static int amdgpu_vkms_prepare_fb(struct drm_plane *plane,
> if (unlikely(r != 0)) {
> if (r != -ERESTARTSYS)
> DRM_ERROR("Failed to pin framebuffer with error %d\n", r);
> - ttm_eu_backoff_reservation(&ticket, &list);
> - return r;
> + goto error_unlock;
> }
>
> r = amdgpu_ttm_alloc_gart(&rbo->tbo);
> if (unlikely(r != 0)) {
> - amdgpu_bo_unpin(rbo);
> - ttm_eu_backoff_reservation(&ticket, &list);
> DRM_ERROR("%p bind failed\n", rbo);
> - return r;
> + goto error_unpin;
> }
>
> - ttm_eu_backoff_reservation(&ticket, &list);
> + amdgpu_bo_unreserve(rbo);
>
> afb->address = amdgpu_bo_gpu_offset(rbo);
>
> amdgpu_bo_ref(rbo);
>
> return 0;
> +
> +error_unpin:
> + amdgpu_bo_unpin(rbo);
> +
> +error_unlock:
> + amdgpu_bo_unreserve(rbo);
> + return r;
> }
>
> static void amdgpu_vkms_cleanup_fb(struct drm_plane *plane,
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/2] drm/amdgpu: remove pointless ttm_eu usage from vkms
2022-04-19 14:49 ` [PATCH 1/2] drm/amdgpu: remove pointless ttm_eu usage from vkms Alex Deucher
@ 2022-04-19 14:55 ` Christian König
2022-04-19 15:01 ` Alex Deucher
0 siblings, 1 reply; 8+ messages in thread
From: Christian König @ 2022-04-19 14:55 UTC (permalink / raw)
To: Alex Deucher, Christian König; +Cc: Ryan Taylor, amd-gfx list
Am 19.04.22 um 16:49 schrieb Alex Deucher:
> On Tue, Apr 19, 2022 at 10:19 AM Christian König
> <ckoenig.leichtzumerken@gmail.com> wrote:
>> We just need to reserve the BO here, no need for using ttm_eu.
> Can you include a more detailed description as to why it's not
> necessary?
Well the logic in ttm_eu is for reserving multiple buffers.
> Most of this code was copied from radeon originally. Does
> radeon need a similar cleanup?
Most likely yes.
Christian.
>
> Alex
>
>> Signed-off-by: Christian König <christian.koenig@amd.com>
>> ---
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 32 +++++++++++++-----------
>> 1 file changed, 17 insertions(+), 15 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
>> index 5224d9a39737..576849e95296 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
>> @@ -302,9 +302,6 @@ static int amdgpu_vkms_prepare_fb(struct drm_plane *plane,
>> struct drm_gem_object *obj;
>> struct amdgpu_device *adev;
>> struct amdgpu_bo *rbo;
>> - struct list_head list;
>> - struct ttm_validate_buffer tv;
>> - struct ww_acquire_ctx ticket;
>> uint32_t domain;
>> int r;
>>
>> @@ -316,18 +313,19 @@ static int amdgpu_vkms_prepare_fb(struct drm_plane *plane,
>> obj = new_state->fb->obj[0];
>> rbo = gem_to_amdgpu_bo(obj);
>> adev = amdgpu_ttm_adev(rbo->tbo.bdev);
>> - INIT_LIST_HEAD(&list);
>>
>> - tv.bo = &rbo->tbo;
>> - tv.num_shared = 1;
>> - list_add(&tv.head, &list);
>> -
>> - r = ttm_eu_reserve_buffers(&ticket, &list, false, NULL);
>> + r = amdgpu_bo_reserve(rbo, true);
>> if (r) {
>> dev_err(adev->dev, "fail to reserve bo (%d)\n", r);
>> return r;
>> }
>>
>> + r = dma_resv_reserve_fences(rbo->tbo.base.resv, 1);
>> + if (r) {
>> + dev_err(adev->dev, "allocating fence slot failed (%d)\n", r);
>> + goto error_unlock;
>> + }
>> +
>> if (plane->type != DRM_PLANE_TYPE_CURSOR)
>> domain = amdgpu_display_supported_domains(adev, rbo->flags);
>> else
>> @@ -337,25 +335,29 @@ static int amdgpu_vkms_prepare_fb(struct drm_plane *plane,
>> if (unlikely(r != 0)) {
>> if (r != -ERESTARTSYS)
>> DRM_ERROR("Failed to pin framebuffer with error %d\n", r);
>> - ttm_eu_backoff_reservation(&ticket, &list);
>> - return r;
>> + goto error_unlock;
>> }
>>
>> r = amdgpu_ttm_alloc_gart(&rbo->tbo);
>> if (unlikely(r != 0)) {
>> - amdgpu_bo_unpin(rbo);
>> - ttm_eu_backoff_reservation(&ticket, &list);
>> DRM_ERROR("%p bind failed\n", rbo);
>> - return r;
>> + goto error_unpin;
>> }
>>
>> - ttm_eu_backoff_reservation(&ticket, &list);
>> + amdgpu_bo_unreserve(rbo);
>>
>> afb->address = amdgpu_bo_gpu_offset(rbo);
>>
>> amdgpu_bo_ref(rbo);
>>
>> return 0;
>> +
>> +error_unpin:
>> + amdgpu_bo_unpin(rbo);
>> +
>> +error_unlock:
>> + amdgpu_bo_unreserve(rbo);
>> + return r;
>> }
>>
>> static void amdgpu_vkms_cleanup_fb(struct drm_plane *plane,
>> --
>> 2.25.1
>>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/2] drm/amdgpu: remove pointless ttm_eu usage from vkms
2022-04-19 14:55 ` Christian König
@ 2022-04-19 15:01 ` Alex Deucher
0 siblings, 0 replies; 8+ messages in thread
From: Alex Deucher @ 2022-04-19 15:01 UTC (permalink / raw)
To: Christian König; +Cc: Christian König, Ryan Taylor, amd-gfx list
On Tue, Apr 19, 2022 at 10:55 AM Christian König
<christian.koenig@amd.com> wrote:
>
> Am 19.04.22 um 16:49 schrieb Alex Deucher:
> > On Tue, Apr 19, 2022 at 10:19 AM Christian König
> > <ckoenig.leichtzumerken@gmail.com> wrote:
> >> We just need to reserve the BO here, no need for using ttm_eu.
> > Can you include a more detailed description as to why it's not
> > necessary?
>
> Well the logic in ttm_eu is for reserving multiple buffers.
With the commit message fixed up to include that detail, the series is:
Acked-by: Alex Deucher <alexander.deucher@amd.com>
>
> > Most of this code was copied from radeon originally. Does
> > radeon need a similar cleanup?
>
> Most likely yes.
>
> Christian.
>
> >
> > Alex
> >
> >> Signed-off-by: Christian König <christian.koenig@amd.com>
> >> ---
> >> drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 32 +++++++++++++-----------
> >> 1 file changed, 17 insertions(+), 15 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
> >> index 5224d9a39737..576849e95296 100644
> >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
> >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
> >> @@ -302,9 +302,6 @@ static int amdgpu_vkms_prepare_fb(struct drm_plane *plane,
> >> struct drm_gem_object *obj;
> >> struct amdgpu_device *adev;
> >> struct amdgpu_bo *rbo;
> >> - struct list_head list;
> >> - struct ttm_validate_buffer tv;
> >> - struct ww_acquire_ctx ticket;
> >> uint32_t domain;
> >> int r;
> >>
> >> @@ -316,18 +313,19 @@ static int amdgpu_vkms_prepare_fb(struct drm_plane *plane,
> >> obj = new_state->fb->obj[0];
> >> rbo = gem_to_amdgpu_bo(obj);
> >> adev = amdgpu_ttm_adev(rbo->tbo.bdev);
> >> - INIT_LIST_HEAD(&list);
> >>
> >> - tv.bo = &rbo->tbo;
> >> - tv.num_shared = 1;
> >> - list_add(&tv.head, &list);
> >> -
> >> - r = ttm_eu_reserve_buffers(&ticket, &list, false, NULL);
> >> + r = amdgpu_bo_reserve(rbo, true);
> >> if (r) {
> >> dev_err(adev->dev, "fail to reserve bo (%d)\n", r);
> >> return r;
> >> }
> >>
> >> + r = dma_resv_reserve_fences(rbo->tbo.base.resv, 1);
> >> + if (r) {
> >> + dev_err(adev->dev, "allocating fence slot failed (%d)\n", r);
> >> + goto error_unlock;
> >> + }
> >> +
> >> if (plane->type != DRM_PLANE_TYPE_CURSOR)
> >> domain = amdgpu_display_supported_domains(adev, rbo->flags);
> >> else
> >> @@ -337,25 +335,29 @@ static int amdgpu_vkms_prepare_fb(struct drm_plane *plane,
> >> if (unlikely(r != 0)) {
> >> if (r != -ERESTARTSYS)
> >> DRM_ERROR("Failed to pin framebuffer with error %d\n", r);
> >> - ttm_eu_backoff_reservation(&ticket, &list);
> >> - return r;
> >> + goto error_unlock;
> >> }
> >>
> >> r = amdgpu_ttm_alloc_gart(&rbo->tbo);
> >> if (unlikely(r != 0)) {
> >> - amdgpu_bo_unpin(rbo);
> >> - ttm_eu_backoff_reservation(&ticket, &list);
> >> DRM_ERROR("%p bind failed\n", rbo);
> >> - return r;
> >> + goto error_unpin;
> >> }
> >>
> >> - ttm_eu_backoff_reservation(&ticket, &list);
> >> + amdgpu_bo_unreserve(rbo);
> >>
> >> afb->address = amdgpu_bo_gpu_offset(rbo);
> >>
> >> amdgpu_bo_ref(rbo);
> >>
> >> return 0;
> >> +
> >> +error_unpin:
> >> + amdgpu_bo_unpin(rbo);
> >> +
> >> +error_unlock:
> >> + amdgpu_bo_unreserve(rbo);
> >> + return r;
> >> }
> >>
> >> static void amdgpu_vkms_cleanup_fb(struct drm_plane *plane,
> >> --
> >> 2.25.1
> >>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-04-19 15:14 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-19 14:19 [PATCH 1/2] drm/amdgpu: remove pointless ttm_eu usage from vkms Christian König
2022-04-19 14:19 ` [PATCH 2/2] drm/amdgpu: remove pointless ttm_eu usage from DM Christian König
2022-04-19 14:37 ` Harry Wentland
2022-04-19 14:42 ` Christian König
2022-04-19 15:14 ` Harry Wentland
2022-04-19 14:49 ` [PATCH 1/2] drm/amdgpu: remove pointless ttm_eu usage from vkms Alex Deucher
2022-04-19 14:55 ` Christian König
2022-04-19 15:01 ` Alex Deucher
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.