* [PATCH] drm/amdgpu: correct vram mgr node size calculation
@ 2020-01-28 19:55 Philip Yang
2020-01-28 19:59 ` Christian König
0 siblings, 1 reply; 3+ messages in thread
From: Philip Yang @ 2020-01-28 19:55 UTC (permalink / raw)
To: amd-gfx; +Cc: Philip Yang
Use pages_per_node instead of mem->num_pages to alloc vram, this will
increase the chance to get vram node after vram fragments.
Signed-off-by: Philip Yang <Philip.Yang@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
index 82a3299e53c0..67a454f4c37a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -369,7 +369,7 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man,
spin_lock(&mgr->lock);
for (i = 0; pages_left >= pages_per_node; ++i) {
- unsigned long pages = rounddown_pow_of_two(pages_left);
+ unsigned long pages = rounddown_pow_of_two(pages_per_node);
r = drm_mm_insert_node_in_range(mm, &nodes[i], pages,
pages_per_node, 0,
@@ -383,15 +383,11 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man,
pages_left -= pages;
}
- for (; pages_left; ++i) {
- unsigned long pages = min(pages_left, pages_per_node);
+ if (pages_left) {
uint32_t alignment = mem->page_alignment;
- if (pages == pages_per_node)
- alignment = pages_per_node;
-
r = drm_mm_insert_node_in_range(mm, &nodes[i],
- pages, alignment, 0,
+ pages_left, alignment, 0,
place->fpfn, lpfn,
mode);
if (unlikely(r))
@@ -399,7 +395,6 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man,
vis_usage += amdgpu_vram_mgr_vis_size(adev, &nodes[i]);
amdgpu_vram_mgr_virt_start(mem, &nodes[i]);
- pages_left -= pages;
}
spin_unlock(&mgr->lock);
--
2.17.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 vram mgr node size calculation
2020-01-28 19:55 [PATCH] drm/amdgpu: correct vram mgr node size calculation Philip Yang
@ 2020-01-28 19:59 ` Christian König
2020-01-29 18:51 ` Philip Yang
0 siblings, 1 reply; 3+ messages in thread
From: Christian König @ 2020-01-28 19:59 UTC (permalink / raw)
To: Philip Yang, amd-gfx
Am 28.01.20 um 20:55 schrieb Philip Yang:
> Use pages_per_node instead of mem->num_pages to alloc vram, this will
> increase the chance to get vram node after vram fragments.
NAK, this is intentional to aid TLB with continuous allocations.
The fallback to using pages_per_node is directly below, so your patch
should be completely superfluous.
Regards,
Christian.
>
> Signed-off-by: Philip Yang <Philip.Yang@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> index 82a3299e53c0..67a454f4c37a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> @@ -369,7 +369,7 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man,
>
> spin_lock(&mgr->lock);
> for (i = 0; pages_left >= pages_per_node; ++i) {
> - unsigned long pages = rounddown_pow_of_two(pages_left);
> + unsigned long pages = rounddown_pow_of_two(pages_per_node);
>
> r = drm_mm_insert_node_in_range(mm, &nodes[i], pages,
> pages_per_node, 0,
> @@ -383,15 +383,11 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man,
> pages_left -= pages;
> }
>
> - for (; pages_left; ++i) {
> - unsigned long pages = min(pages_left, pages_per_node);
> + if (pages_left) {
> uint32_t alignment = mem->page_alignment;
>
> - if (pages == pages_per_node)
> - alignment = pages_per_node;
> -
> r = drm_mm_insert_node_in_range(mm, &nodes[i],
> - pages, alignment, 0,
> + pages_left, alignment, 0,
> place->fpfn, lpfn,
> mode);
> if (unlikely(r))
> @@ -399,7 +395,6 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man,
>
> vis_usage += amdgpu_vram_mgr_vis_size(adev, &nodes[i]);
> amdgpu_vram_mgr_virt_start(mem, &nodes[i]);
> - pages_left -= pages;
> }
> spin_unlock(&mgr->lock);
>
_______________________________________________
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 vram mgr node size calculation
2020-01-28 19:59 ` Christian König
@ 2020-01-29 18:51 ` Philip Yang
0 siblings, 0 replies; 3+ messages in thread
From: Philip Yang @ 2020-01-29 18:51 UTC (permalink / raw)
To: christian.koenig, amd-gfx
Thanks and understand.
Philip
On 2020-01-28 2:59 p.m., Christian König wrote:
> Am 28.01.20 um 20:55 schrieb Philip Yang:
>> Use pages_per_node instead of mem->num_pages to alloc vram, this will
>> increase the chance to get vram node after vram fragments.
>
> NAK, this is intentional to aid TLB with continuous allocations.
>
> The fallback to using pages_per_node is directly below, so your patch
> should be completely superfluous.
>
> Regards,
> Christian.
>
>>
>> Signed-off-by: Philip Yang <Philip.Yang@amd.com>
>> ---
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 11 +++--------
>> 1 file changed, 3 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
>> index 82a3299e53c0..67a454f4c37a 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
>> @@ -369,7 +369,7 @@ static int amdgpu_vram_mgr_new(struct
>> ttm_mem_type_manager *man,
>> spin_lock(&mgr->lock);
>> for (i = 0; pages_left >= pages_per_node; ++i) {
>> - unsigned long pages = rounddown_pow_of_two(pages_left);
>> + unsigned long pages = rounddown_pow_of_two(pages_per_node);
>> r = drm_mm_insert_node_in_range(mm, &nodes[i], pages,
>> pages_per_node, 0,
>> @@ -383,15 +383,11 @@ static int amdgpu_vram_mgr_new(struct
>> ttm_mem_type_manager *man,
>> pages_left -= pages;
>> }
>> - for (; pages_left; ++i) {
>> - unsigned long pages = min(pages_left, pages_per_node);
>> + if (pages_left) {
>> uint32_t alignment = mem->page_alignment;
>> - if (pages == pages_per_node)
>> - alignment = pages_per_node;
>> -
>> r = drm_mm_insert_node_in_range(mm, &nodes[i],
>> - pages, alignment, 0,
>> + pages_left, alignment, 0,
>> place->fpfn, lpfn,
>> mode);
>> if (unlikely(r))
>> @@ -399,7 +395,6 @@ static int amdgpu_vram_mgr_new(struct
>> ttm_mem_type_manager *man,
>> vis_usage += amdgpu_vram_mgr_vis_size(adev, &nodes[i]);
>> amdgpu_vram_mgr_virt_start(mem, &nodes[i]);
>> - pages_left -= pages;
>> }
>> spin_unlock(&mgr->lock);
>
_______________________________________________
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:[~2020-01-29 18:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-28 19:55 [PATCH] drm/amdgpu: correct vram mgr node size calculation Philip Yang
2020-01-28 19:59 ` Christian König
2020-01-29 18:51 ` Philip Yang
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.