Revert "drm/amdgpu: free up the first paging queue v2"
Subsystems (2)
PATCH 1/1 Revert "drm/amdgpu: free up the first paging queue v2"
This reverts commit 4f8bc72fbf10f2dc8bca74d5da08b3a981b2e5cd.
Change-Id: I577ba236e0571d11400a51f9d95840234aef678a
--- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +8 -15
@@ -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 = {
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1566590496-27967-1-git-send-email-gaba-5C7GfCeVMHo@public.gmane.org
Am 23.08.19 um 22:01 schrieb Gang Ba:
Quoted 3 lines
This reverts commit
4f8bc72fbf10f2dc8bca74d5da08b3a981b2e5cd.Change-Id: I577ba236e0571d11400a51f9d95840234aef678a
Missing Signed-of-by line here. With that fixed Reviewed-by: Christian König <[email protected]>
Quoted 38 lines
--- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-)drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +5
-12@@ -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] =
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c static void sdma_v4_0_set_vm_pte_funcs(struct amdgpu_device *adev) · line 2534
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +3
-3- &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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): cc47da8a-ce82-3f17-dcf9-aa11484f53a2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Quoted 7 lines · Christian König
Am 23.08.19 um 22:01 schrieb Gang Ba:
Quoted 3 lines
This reverts commit
4f8bc72fbf10f2dc8bca74d5da08b3a981b2e5cd.Change-Id: I577ba236e0571d11400a51f9d95840234aef678a
Missing Signed-of-by line here. With that fixed Reviewed-by: Christian König <[email protected]>
Every revert needs to explain in the commit log why the commit is being reverted.
Signature · 6 lines
Earthling Michel Dänzer | https://redhat.com Libre software enthusiast | Mesa and X developer _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 3dfac757-dce5-97d4-549d-97bb476ff9fa-otUistvHUpPR7s880joybQ@public.gmane.org
Am 25.08.19 um 17:29 schrieb Michel Dänzer:
Quoted 9 lines · Christian König
Quoted 6 lines
Am 23.08.19 um 22:01 schrieb Gang Ba:
Quoted 3 lines
This reverts commit
4f8bc72fbf10f2dc8bca74d5da08b3a981b2e5cd.Change-Id: I577ba236e0571d11400a51f9d95840234aef678a
Missing Signed-of-by line here. With that fixed Reviewed-by: Christian König <[email protected]>
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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx