* [PATCH] Revert "drm/amdgpu: free up the first paging queue v2"
@ 2019-08-23 20:01 Gang Ba
[not found] ` <1566590496-27967-1-git-send-email-gaba-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Gang Ba @ 2019-08-23 20:01 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Ba, Gang
This reverts commit 4f8bc72fbf10f2dc8bca74d5da08b3a981b2e5cd.
Change-Id: I577ba236e0571d11400a51f9d95840234aef678a
---
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index b3b2c21..7750b37 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
@@ -2500,8 +2500,8 @@ static const struct amdgpu_buffer_funcs sdma_v4_0_buffer_funcs = {
static void sdma_v4_0_set_buffer_funcs(struct amdgpu_device *adev)
{
adev->mman.buffer_funcs = &sdma_v4_0_buffer_funcs;
- if (adev->sdma.has_page_queue && adev->sdma.num_instances > 1)
- adev->mman.buffer_funcs_ring = &adev->sdma.instance[1].page;
+ if (adev->sdma.has_page_queue)
+ adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].page;
else
adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring;
}
@@ -2520,22 +2520,15 @@ static void sdma_v4_0_set_vm_pte_funcs(struct amdgpu_device *adev)
unsigned i;
adev->vm_manager.vm_pte_funcs = &sdma_v4_0_vm_pte_funcs;
- if (adev->sdma.has_page_queue && adev->sdma.num_instances > 1) {
- for (i = 1; i < adev->sdma.num_instances; i++) {
+ for (i = 0; i < adev->sdma.num_instances; i++) {
+ if (adev->sdma.has_page_queue)
sched = &adev->sdma.instance[i].page.sched;
- adev->vm_manager.vm_pte_rqs[i - 1] =
- &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
- }
- adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances - 1;
- adev->vm_manager.page_fault = &adev->sdma.instance[0].page;
- } else {
- for (i = 0; i < adev->sdma.num_instances; i++) {
+ else
sched = &adev->sdma.instance[i].ring.sched;
- adev->vm_manager.vm_pte_rqs[i] =
- &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
- }
- adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;
+ adev->vm_manager.vm_pte_rqs[i] =
+ &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
}
+ adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;
}
const struct amdgpu_ip_block_version sdma_v4_0_ip_block = {
--
2.7.4
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Revert "drm/amdgpu: free up the first paging queue v2"
[not found] ` <1566590496-27967-1-git-send-email-gaba-5C7GfCeVMHo@public.gmane.org>
@ 2019-08-24 11:10 ` Christian König
[not found] ` <cc47da8a-ce82-3f17-dcf9-aa11484f53a2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Christian König @ 2019-08-24 11:10 UTC (permalink / raw)
To: Gang Ba, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Ba, Gang
Am 23.08.19 um 22:01 schrieb Gang Ba:
> This reverts commit 4f8bc72fbf10f2dc8bca74d5da08b3a981b2e5cd.
>
> Change-Id: I577ba236e0571d11400a51f9d95840234aef678a
Missing Signed-of-by line here. With that fixed Reviewed-by: Christian
König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 23 ++++++++---------------
> 1 file changed, 8 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> index b3b2c21..7750b37 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> @@ -2500,8 +2500,8 @@ static const struct amdgpu_buffer_funcs sdma_v4_0_buffer_funcs = {
> static void sdma_v4_0_set_buffer_funcs(struct amdgpu_device *adev)
> {
> adev->mman.buffer_funcs = &sdma_v4_0_buffer_funcs;
> - if (adev->sdma.has_page_queue && adev->sdma.num_instances > 1)
> - adev->mman.buffer_funcs_ring = &adev->sdma.instance[1].page;
> + if (adev->sdma.has_page_queue)
> + adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].page;
> else
> adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring;
> }
> @@ -2520,22 +2520,15 @@ static void sdma_v4_0_set_vm_pte_funcs(struct amdgpu_device *adev)
> unsigned i;
>
> adev->vm_manager.vm_pte_funcs = &sdma_v4_0_vm_pte_funcs;
> - if (adev->sdma.has_page_queue && adev->sdma.num_instances > 1) {
> - for (i = 1; i < adev->sdma.num_instances; i++) {
> + for (i = 0; i < adev->sdma.num_instances; i++) {
> + if (adev->sdma.has_page_queue)
> sched = &adev->sdma.instance[i].page.sched;
> - adev->vm_manager.vm_pte_rqs[i - 1] =
> - &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
> - }
> - adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances - 1;
> - adev->vm_manager.page_fault = &adev->sdma.instance[0].page;
> - } else {
> - for (i = 0; i < adev->sdma.num_instances; i++) {
> + else
> sched = &adev->sdma.instance[i].ring.sched;
> - adev->vm_manager.vm_pte_rqs[i] =
> - &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
> - }
> - adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;
> + adev->vm_manager.vm_pte_rqs[i] =
> + &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
> }
> + adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;
> }
>
> const struct amdgpu_ip_block_version sdma_v4_0_ip_block = {
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Revert "drm/amdgpu: free up the first paging queue v2"
[not found] ` <cc47da8a-ce82-3f17-dcf9-aa11484f53a2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2019-08-25 15:29 ` Michel Dänzer
[not found] ` <3dfac757-dce5-97d4-549d-97bb476ff9fa-otUistvHUpPR7s880joybQ@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Michel Dänzer @ 2019-08-25 15:29 UTC (permalink / raw)
To: christian.koenig-5C7GfCeVMHo, Gang Ba
Cc: Ba, Gang, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
On 2019-08-24 1:10 p.m., Christian König wrote:
> Am 23.08.19 um 22:01 schrieb Gang Ba:
>> This reverts commit 4f8bc72fbf10f2dc8bca74d5da08b3a981b2e5cd.
>>
>> Change-Id: I577ba236e0571d11400a51f9d95840234aef678a
>
> Missing Signed-of-by line here. With that fixed Reviewed-by: Christian
> König <christian.koenig@amd.com>
Every revert needs to explain in the commit log why the commit is being
reverted.
--
Earthling Michel Dänzer | https://redhat.com
Libre software enthusiast | Mesa and X developer
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Revert "drm/amdgpu: free up the first paging queue v2"
[not found] ` <3dfac757-dce5-97d4-549d-97bb476ff9fa-otUistvHUpPR7s880joybQ@public.gmane.org>
@ 2019-08-25 17:46 ` Christian König
0 siblings, 0 replies; 6+ messages in thread
From: Christian König @ 2019-08-25 17:46 UTC (permalink / raw)
To: Michel Dänzer, christian.koenig-5C7GfCeVMHo, Gang Ba
Cc: Ba, Gang, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Am 25.08.19 um 17:29 schrieb Michel Dänzer:
> On 2019-08-24 1:10 p.m., Christian König wrote:
>> Am 23.08.19 um 22:01 schrieb Gang Ba:
>>> This reverts commit 4f8bc72fbf10f2dc8bca74d5da08b3a981b2e5cd.
>>>
>>> Change-Id: I577ba236e0571d11400a51f9d95840234aef678a
>> Missing Signed-of-by line here. With that fixed Reviewed-by: Christian
>> König <christian.koenig@amd.com>
> Every revert needs to explain in the commit log why the commit is being
> reverted.
Something like: It turned out that a single reserved queue wouldn't be
sufficient for page fault handling.
Christian.
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Revert "drm/amdgpu: free up the first paging queue v2"
[not found] ` <1566830720-20121-1-git-send-email-gaba-5C7GfCeVMHo@public.gmane.org>
@ 2019-08-26 14:58 ` Christian König
0 siblings, 0 replies; 6+ messages in thread
From: Christian König @ 2019-08-26 14:58 UTC (permalink / raw)
To: Gang Ba, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Ba, Gang
Am 26.08.19 um 16:45 schrieb Gang Ba:
> This reverts commit 4f8bc72fbf10f2dc8bca74d5da08b3a981b2e5cd.
>
> It turned out that a single reserved queue wouldn't be
> sufficient for page fault handling.
>
> Change-Id: I577ba236e0571d11400a51f9d95840234aef678a
> Signed-off-by: Gang Ba <gaba@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 23 ++++++++---------------
> 1 file changed, 8 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> index b3b2c21..7750b37 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> @@ -2500,8 +2500,8 @@ static const struct amdgpu_buffer_funcs sdma_v4_0_buffer_funcs = {
> static void sdma_v4_0_set_buffer_funcs(struct amdgpu_device *adev)
> {
> adev->mman.buffer_funcs = &sdma_v4_0_buffer_funcs;
> - if (adev->sdma.has_page_queue && adev->sdma.num_instances > 1)
> - adev->mman.buffer_funcs_ring = &adev->sdma.instance[1].page;
> + if (adev->sdma.has_page_queue)
> + adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].page;
> else
> adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring;
> }
> @@ -2520,22 +2520,15 @@ static void sdma_v4_0_set_vm_pte_funcs(struct amdgpu_device *adev)
> unsigned i;
>
> adev->vm_manager.vm_pte_funcs = &sdma_v4_0_vm_pte_funcs;
> - if (adev->sdma.has_page_queue && adev->sdma.num_instances > 1) {
> - for (i = 1; i < adev->sdma.num_instances; i++) {
> + for (i = 0; i < adev->sdma.num_instances; i++) {
> + if (adev->sdma.has_page_queue)
> sched = &adev->sdma.instance[i].page.sched;
> - adev->vm_manager.vm_pte_rqs[i - 1] =
> - &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
> - }
> - adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances - 1;
> - adev->vm_manager.page_fault = &adev->sdma.instance[0].page;
> - } else {
> - for (i = 0; i < adev->sdma.num_instances; i++) {
> + else
> sched = &adev->sdma.instance[i].ring.sched;
> - adev->vm_manager.vm_pte_rqs[i] =
> - &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
> - }
> - adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;
> + adev->vm_manager.vm_pte_rqs[i] =
> + &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
> }
> + adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;
> }
>
> const struct amdgpu_ip_block_version sdma_v4_0_ip_block = {
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] Revert "drm/amdgpu: free up the first paging queue v2"
@ 2019-08-26 14:45 Gang Ba
[not found] ` <1566830720-20121-1-git-send-email-gaba-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Gang Ba @ 2019-08-26 14:45 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Ba, Gang
This reverts commit 4f8bc72fbf10f2dc8bca74d5da08b3a981b2e5cd.
It turned out that a single reserved queue wouldn't be
sufficient for page fault handling.
Change-Id: I577ba236e0571d11400a51f9d95840234aef678a
Signed-off-by: Gang Ba <gaba@amd.com>
---
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index b3b2c21..7750b37 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
@@ -2500,8 +2500,8 @@ static const struct amdgpu_buffer_funcs sdma_v4_0_buffer_funcs = {
static void sdma_v4_0_set_buffer_funcs(struct amdgpu_device *adev)
{
adev->mman.buffer_funcs = &sdma_v4_0_buffer_funcs;
- if (adev->sdma.has_page_queue && adev->sdma.num_instances > 1)
- adev->mman.buffer_funcs_ring = &adev->sdma.instance[1].page;
+ if (adev->sdma.has_page_queue)
+ adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].page;
else
adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring;
}
@@ -2520,22 +2520,15 @@ static void sdma_v4_0_set_vm_pte_funcs(struct amdgpu_device *adev)
unsigned i;
adev->vm_manager.vm_pte_funcs = &sdma_v4_0_vm_pte_funcs;
- if (adev->sdma.has_page_queue && adev->sdma.num_instances > 1) {
- for (i = 1; i < adev->sdma.num_instances; i++) {
+ for (i = 0; i < adev->sdma.num_instances; i++) {
+ if (adev->sdma.has_page_queue)
sched = &adev->sdma.instance[i].page.sched;
- adev->vm_manager.vm_pte_rqs[i - 1] =
- &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
- }
- adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances - 1;
- adev->vm_manager.page_fault = &adev->sdma.instance[0].page;
- } else {
- for (i = 0; i < adev->sdma.num_instances; i++) {
+ else
sched = &adev->sdma.instance[i].ring.sched;
- adev->vm_manager.vm_pte_rqs[i] =
- &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
- }
- adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;
+ adev->vm_manager.vm_pte_rqs[i] =
+ &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
}
+ adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;
}
const struct amdgpu_ip_block_version sdma_v4_0_ip_block = {
--
2.7.4
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-08-26 14:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-23 20:01 [PATCH] Revert "drm/amdgpu: free up the first paging queue v2" Gang Ba
[not found] ` <1566590496-27967-1-git-send-email-gaba-5C7GfCeVMHo@public.gmane.org>
2019-08-24 11:10 ` Christian König
[not found] ` <cc47da8a-ce82-3f17-dcf9-aa11484f53a2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2019-08-25 15:29 ` Michel Dänzer
[not found] ` <3dfac757-dce5-97d4-549d-97bb476ff9fa-otUistvHUpPR7s880joybQ@public.gmane.org>
2019-08-25 17:46 ` Christian König
2019-08-26 14:45 Gang Ba
[not found] ` <1566830720-20121-1-git-send-email-gaba-5C7GfCeVMHo@public.gmane.org>
2019-08-26 14:58 ` 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.