* [PATCH 1/2] drm/amdgpu: reapply "fix start calculation in amdgpu_vram_mgr_new""
@ 2022-07-14 13:23 Christian König
2022-07-14 13:23 ` [PATCH 2/2] drm/amdgpu: re-apply "move internal vram_mgr function into the C file"" Christian König
2022-07-14 13:25 ` [PATCH 1/2] drm/amdgpu: reapply "fix start calculation in amdgpu_vram_mgr_new"" Arunpravin Paneer Selvam
0 siblings, 2 replies; 4+ messages in thread
From: Christian König @ 2022-07-14 13:23 UTC (permalink / raw)
To: Arunpravin.PaneerSelvam, amd-gfx; +Cc: Christian König
This re-applys commit 5e3f1e7729ec7a99e145e9d8ed58963d86cdfb98.
The original problem this was reverted for was found and the correct fix
will be merged to drm-misc-next-fixes.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 22 +++++++++++++-------
1 file changed, 14 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 49e4092f447f..51d9d3a4456c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -496,16 +496,22 @@ static int amdgpu_vram_mgr_new(struct ttm_resource_manager *man,
list_splice_tail(trim_list, &vres->blocks);
}
- list_for_each_entry(block, &vres->blocks, link)
- vis_usage += amdgpu_vram_mgr_vis_size(adev, block);
+ vres->base.start = 0;
+ list_for_each_entry(block, &vres->blocks, link) {
+ unsigned long start;
- block = amdgpu_vram_mgr_first_block(&vres->blocks);
- if (!block) {
- r = -EINVAL;
- goto error_fini;
- }
+ start = amdgpu_vram_mgr_block_start(block) +
+ amdgpu_vram_mgr_block_size(block);
+ start >>= PAGE_SHIFT;
- vres->base.start = amdgpu_vram_mgr_block_start(block) >> PAGE_SHIFT;
+ if (start > vres->base.num_pages)
+ start -= vres->base.num_pages;
+ else
+ start = 0;
+ vres->base.start = max(vres->base.start, start);
+
+ vis_usage += amdgpu_vram_mgr_vis_size(adev, block);
+ }
if (amdgpu_is_vram_mgr_blocks_contiguous(&vres->blocks))
vres->base.placement |= TTM_PL_FLAG_CONTIGUOUS;
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] drm/amdgpu: re-apply "move internal vram_mgr function into the C file""
2022-07-14 13:23 [PATCH 1/2] drm/amdgpu: reapply "fix start calculation in amdgpu_vram_mgr_new"" Christian König
@ 2022-07-14 13:23 ` Christian König
2022-07-14 13:26 ` Arunpravin Paneer Selvam
2022-07-14 13:25 ` [PATCH 1/2] drm/amdgpu: reapply "fix start calculation in amdgpu_vram_mgr_new"" Arunpravin Paneer Selvam
1 sibling, 1 reply; 4+ messages in thread
From: Christian König @ 2022-07-14 13:23 UTC (permalink / raw)
To: Arunpravin.PaneerSelvam, amd-gfx; +Cc: Christian König
This re-applys commit 708d19d9f362766147cab79eccae60912c6d3068.
The original problem this was reverted for was found and the correct fix
will be merged to drm-misc-next-fixes.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 29 ++++++++++++++++++++
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h | 27 ------------------
2 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
index 51d9d3a4456c..7a5e8a7b4a1b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -50,6 +50,35 @@ to_amdgpu_device(struct amdgpu_vram_mgr *mgr)
return container_of(mgr, struct amdgpu_device, mman.vram_mgr);
}
+static inline struct drm_buddy_block *
+amdgpu_vram_mgr_first_block(struct list_head *list)
+{
+ return list_first_entry_or_null(list, struct drm_buddy_block, link);
+}
+
+static inline bool amdgpu_is_vram_mgr_blocks_contiguous(struct list_head *head)
+{
+ struct drm_buddy_block *block;
+ u64 start, size;
+
+ block = amdgpu_vram_mgr_first_block(head);
+ if (!block)
+ return false;
+
+ while (head != block->link.next) {
+ start = amdgpu_vram_mgr_block_start(block);
+ size = amdgpu_vram_mgr_block_size(block);
+
+ block = list_entry(block->link.next, struct drm_buddy_block, link);
+ if (start + size != amdgpu_vram_mgr_block_start(block))
+ return false;
+ }
+
+ return true;
+}
+
+
+
/**
* DOC: mem_info_vram_total
*
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h
index 9a2db87186c7..4b267bf1c5db 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h
@@ -53,33 +53,6 @@ static inline u64 amdgpu_vram_mgr_block_size(struct drm_buddy_block *block)
return PAGE_SIZE << drm_buddy_block_order(block);
}
-static inline struct drm_buddy_block *
-amdgpu_vram_mgr_first_block(struct list_head *list)
-{
- return list_first_entry_or_null(list, struct drm_buddy_block, link);
-}
-
-static inline bool amdgpu_is_vram_mgr_blocks_contiguous(struct list_head *head)
-{
- struct drm_buddy_block *block;
- u64 start, size;
-
- block = amdgpu_vram_mgr_first_block(head);
- if (!block)
- return false;
-
- while (head != block->link.next) {
- start = amdgpu_vram_mgr_block_start(block);
- size = amdgpu_vram_mgr_block_size(block);
-
- block = list_entry(block->link.next, struct drm_buddy_block, link);
- if (start + size != amdgpu_vram_mgr_block_start(block))
- return false;
- }
-
- return true;
-}
-
static inline struct amdgpu_vram_mgr_resource *
to_amdgpu_vram_mgr_resource(struct ttm_resource *res)
{
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] drm/amdgpu: reapply "fix start calculation in amdgpu_vram_mgr_new""
2022-07-14 13:23 [PATCH 1/2] drm/amdgpu: reapply "fix start calculation in amdgpu_vram_mgr_new"" Christian König
2022-07-14 13:23 ` [PATCH 2/2] drm/amdgpu: re-apply "move internal vram_mgr function into the C file"" Christian König
@ 2022-07-14 13:25 ` Arunpravin Paneer Selvam
1 sibling, 0 replies; 4+ messages in thread
From: Arunpravin Paneer Selvam @ 2022-07-14 13:25 UTC (permalink / raw)
To: Christian König, amd-gfx; +Cc: Christian König
[-- Attachment #1: Type: text/plain, Size: 1842 bytes --]
Hi Christian,
I verified the patch.
Reviewed-by: Arunpravin Paneer Selvam <Arunpravin.PaneerSelvam@amd.com>
Regards,
Arun
On 7/14/2022 6:53 PM, Christian König wrote:
> This re-applys commit 5e3f1e7729ec7a99e145e9d8ed58963d86cdfb98.
>
> The original problem this was reverted for was found and the correct fix
> will be merged to drm-misc-next-fixes.
>
> Signed-off-by: Christian König<christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 22 +++++++++++++-------
> 1 file changed, 14 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 49e4092f447f..51d9d3a4456c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> @@ -496,16 +496,22 @@ static int amdgpu_vram_mgr_new(struct ttm_resource_manager *man,
> list_splice_tail(trim_list, &vres->blocks);
> }
>
> - list_for_each_entry(block, &vres->blocks, link)
> - vis_usage += amdgpu_vram_mgr_vis_size(adev, block);
> + vres->base.start = 0;
> + list_for_each_entry(block, &vres->blocks, link) {
> + unsigned long start;
>
> - block = amdgpu_vram_mgr_first_block(&vres->blocks);
> - if (!block) {
> - r = -EINVAL;
> - goto error_fini;
> - }
> + start = amdgpu_vram_mgr_block_start(block) +
> + amdgpu_vram_mgr_block_size(block);
> + start >>= PAGE_SHIFT;
>
> - vres->base.start = amdgpu_vram_mgr_block_start(block) >> PAGE_SHIFT;
> + if (start > vres->base.num_pages)
> + start -= vres->base.num_pages;
> + else
> + start = 0;
> + vres->base.start = max(vres->base.start, start);
> +
> + vis_usage += amdgpu_vram_mgr_vis_size(adev, block);
> + }
>
> if (amdgpu_is_vram_mgr_blocks_contiguous(&vres->blocks))
> vres->base.placement |= TTM_PL_FLAG_CONTIGUOUS;
[-- Attachment #2: Type: text/html, Size: 2400 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] drm/amdgpu: re-apply "move internal vram_mgr function into the C file""
2022-07-14 13:23 ` [PATCH 2/2] drm/amdgpu: re-apply "move internal vram_mgr function into the C file"" Christian König
@ 2022-07-14 13:26 ` Arunpravin Paneer Selvam
0 siblings, 0 replies; 4+ messages in thread
From: Arunpravin Paneer Selvam @ 2022-07-14 13:26 UTC (permalink / raw)
To: Christian König, amd-gfx; +Cc: Christian König
[-- Attachment #1: Type: text/plain, Size: 3112 bytes --]
Hi Christian,
I verified the patch.
Reviewed-by: Arunpravin Paneer Selvam <Arunpravin.PaneerSelvam@amd.com>
Thanks,
Arun
On 7/14/2022 6:53 PM, Christian König wrote:
> This re-applys commit 708d19d9f362766147cab79eccae60912c6d3068.
>
> The original problem this was reverted for was found and the correct fix
> will be merged to drm-misc-next-fixes.
>
> Signed-off-by: Christian König<christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 29 ++++++++++++++++++++
> drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h | 27 ------------------
> 2 files changed, 29 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> index 51d9d3a4456c..7a5e8a7b4a1b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> @@ -50,6 +50,35 @@ to_amdgpu_device(struct amdgpu_vram_mgr *mgr)
> return container_of(mgr, struct amdgpu_device, mman.vram_mgr);
> }
>
> +static inline struct drm_buddy_block *
> +amdgpu_vram_mgr_first_block(struct list_head *list)
> +{
> + return list_first_entry_or_null(list, struct drm_buddy_block, link);
> +}
> +
> +static inline bool amdgpu_is_vram_mgr_blocks_contiguous(struct list_head *head)
> +{
> + struct drm_buddy_block *block;
> + u64 start, size;
> +
> + block = amdgpu_vram_mgr_first_block(head);
> + if (!block)
> + return false;
> +
> + while (head != block->link.next) {
> + start = amdgpu_vram_mgr_block_start(block);
> + size = amdgpu_vram_mgr_block_size(block);
> +
> + block = list_entry(block->link.next, struct drm_buddy_block, link);
> + if (start + size != amdgpu_vram_mgr_block_start(block))
> + return false;
> + }
> +
> + return true;
> +}
> +
> +
> +
> /**
> * DOC: mem_info_vram_total
> *
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h
> index 9a2db87186c7..4b267bf1c5db 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h
> @@ -53,33 +53,6 @@ static inline u64 amdgpu_vram_mgr_block_size(struct drm_buddy_block *block)
> return PAGE_SIZE << drm_buddy_block_order(block);
> }
>
> -static inline struct drm_buddy_block *
> -amdgpu_vram_mgr_first_block(struct list_head *list)
> -{
> - return list_first_entry_or_null(list, struct drm_buddy_block, link);
> -}
> -
> -static inline bool amdgpu_is_vram_mgr_blocks_contiguous(struct list_head *head)
> -{
> - struct drm_buddy_block *block;
> - u64 start, size;
> -
> - block = amdgpu_vram_mgr_first_block(head);
> - if (!block)
> - return false;
> -
> - while (head != block->link.next) {
> - start = amdgpu_vram_mgr_block_start(block);
> - size = amdgpu_vram_mgr_block_size(block);
> -
> - block = list_entry(block->link.next, struct drm_buddy_block, link);
> - if (start + size != amdgpu_vram_mgr_block_start(block))
> - return false;
> - }
> -
> - return true;
> -}
> -
> static inline struct amdgpu_vram_mgr_resource *
> to_amdgpu_vram_mgr_resource(struct ttm_resource *res)
> {
[-- Attachment #2: Type: text/html, Size: 3524 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-07-14 13:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-14 13:23 [PATCH 1/2] drm/amdgpu: reapply "fix start calculation in amdgpu_vram_mgr_new"" Christian König
2022-07-14 13:23 ` [PATCH 2/2] drm/amdgpu: re-apply "move internal vram_mgr function into the C file"" Christian König
2022-07-14 13:26 ` Arunpravin Paneer Selvam
2022-07-14 13:25 ` [PATCH 1/2] drm/amdgpu: reapply "fix start calculation in amdgpu_vram_mgr_new"" Arunpravin Paneer Selvam
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.