drm/amdgpu: modify invalidate semaphore limit in gmc9
Subsystems (2)
PATCH 1/2 drm/amdgpu: modify invalidate semaphore limit in gmc9
From: changzhu <[email protected]>
It may fail to load guest driver in round 2 or cause Xstart problem when using invalidate semaphore for SRIOV or picasso. So it needs avoid using invalidate semaphore for SRIOV and picasso.
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 47 +++++++++++++++------------ 1 file changed, 27 insertions(+), 20 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +27 -20
@@ -412,6 +412,27 @@ static uint32_t gmc_v9_0_get_invalidate_req(unsigned int vmid,return req; } +/** +* gmc_v9_0_use_invalidate_semaphore - judge whether to use semaphore +* +* @adev: amdgpu_device pointer +* @vmhub: vmhub type +* +*/ +static bool gmc_v9_0_use_invalidate_semaphore (struct amdgpu_device *adev, +uint32_t vmhub) +{ +if ((vmhub ==AMDGPU_MMHUB_0 || + vmhub ==AMDGPU_MMHUB_1 ) && + (!amdgpu_sriov_vf (adev)) && + (!(adev->asic_type ==CHIP_RAVEN && + adev->rev_id <0x8 && + adev->pdev->device ==0x15d8 ))) +return true; +else +return false; +} +/* * GART * VMID 0 is the physical GPU addresses as used by the kernel.
@@ -434,6 +455,7 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,const unsigned eng =17 ;u32 j, tmp;struct amdgpu_vmhub *hub; +bool value =gmc_v9_0_use_invalidate_semaphore (adev, vmhub);BUG_ON (vmhub >= adev->num_vmhubs);
@@ -464,11 +486,7 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,*/ /* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */ -if ((vmhub ==AMDGPU_MMHUB_0 || - vmhub ==AMDGPU_MMHUB_1 ) && - (!(adev->asic_type ==CHIP_RAVEN && - adev->rev_id <0x8 && - adev->pdev->device ==0x15d8 ))) { +if (value) {for (j =0 ; j < adev->usec_timeout; j++) {/* a read return value of 1 means semaphore acuqire */ tmp =RREG32_NO_KIQ (hub->vm_inv_eng0_sem + eng);
@@ -498,11 +516,7 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, }/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */ -if ((vmhub ==AMDGPU_MMHUB_0 || - vmhub ==AMDGPU_MMHUB_1 ) && - (!(adev->asic_type ==CHIP_RAVEN && - adev->rev_id <0x8 && - adev->pdev->device ==0x15d8 ))) +if (value)/* * add semaphore release after invalidation, * write with 0 means semaphore release
@@ -524,6 +538,7 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,struct amdgpu_vmhub *hub = &adev->vmhub[ring->funcs->vmhub];uint32_t req =gmc_v9_0_get_invalidate_req (vmid,0 );unsigned eng = ring->vm_inv_eng; +bool value =gmc_v9_0_use_invalidate_semaphore (ring->adev, ring->funcs->vmhub);/* * It may lose gpuvm invalidate acknowldege state across power-gating
@@ -533,11 +548,7 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,*/ /* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */ -if ((ring->funcs->vmhub ==AMDGPU_MMHUB_0 || - ring->funcs->vmhub ==AMDGPU_MMHUB_1 ) && - (!(adev->asic_type ==CHIP_RAVEN && - adev->rev_id <0x8 && - adev->pdev->device ==0x15d8 ))) +if (value)/* a read return value of 1 means semaphore acuqire */ amdgpu_ring_emit_reg_wait (ring, hub->vm_inv_eng0_sem + eng,0x1 ,0x1 );
@@ -553,11 +564,7 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring, req, 1 << vmid);/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */ -if ((ring->funcs->vmhub ==AMDGPU_MMHUB_0 || - ring->funcs->vmhub ==AMDGPU_MMHUB_1 ) && - (!(adev->asic_type ==CHIP_RAVEN && - adev->rev_id <0x8 && - adev->pdev->device ==0x15d8 ))) +if (value)/* * add semaphore release after invalidation, * write with 0 means semaphore release
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 46 lines · Changfeng.Zhu
From: changzhu <[email protected]>
It may fail to load guest driver in round 2 or cause Xstart problem when using invalidate semaphore for SRIOV or picasso. So it needs avoid using invalidate semaphore for SRIOV and picasso.
Change-Id I806f8e99ec97be84e6aed0f5c499a53b1931b490Signed-off-by changzhu <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 47 +++++++++++++++------------ 1 file changed, 27 insertions(+), 20 deletions(-)drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +21
-0@@ -412,6 +412,27 @@ static uint32_t gmc_v9_0_get_invalidate_req(unsigned int vmid,return req; } +/** +* gmc_v9_0_use_invalidate_semaphore - judge whether to use semaphore +* +* @adev: amdgpu_device pointer +* @vmhub: vmhub type +* +*/ +static bool gmc_v9_0_use_invalidate_semaphore (struct amdgpu_device *adev, +uint32_t vmhub) +{ +if ((vmhub ==AMDGPU_MMHUB_0 || + vmhub ==AMDGPU_MMHUB_1 ) && + (!amdgpu_sriov_vf (adev)) && + (!(adev->asic_type ==CHIP_RAVEN && + adev->rev_id <0x8 && + adev->pdev->device ==0x15d8 ))) +return true; +else +return false; +} +/* * GART * VMID 0 is the physical GPU addresses as used by the kernel.
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, · line 458
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +1
-0@@ -434,6 +455,7 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,const unsigned eng =17 ;u32 j, tmp;struct amdgpu_vmhub *hub; +bool value =gmc_v9_0_use_invalidate_semaphore (adev, vmhub);
Call this use_semaphore or something like that rather than value. Same comment to the instances below as well. With that fixed,
Quoted 66 lines
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +5
-21BUG_ON (vmhub >= adev->num_vmhubs);@@ -464,11 +486,7 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,*/ /* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */ -if ((vmhub ==AMDGPU_MMHUB_0 || - vmhub ==AMDGPU_MMHUB_1 ) && - (!(adev->asic_type ==CHIP_RAVEN && - adev->rev_id <0x8 && - adev->pdev->device ==0x15d8 ))) { +if (value) {for (j =0 ; j < adev->usec_timeout; j++) {/* a read return value of 1 means semaphore acuqire */ tmp =RREG32_NO_KIQ (hub->vm_inv_eng0_sem + eng);@@ -498,11 +516,7 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, }/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */ -if ((vmhub ==AMDGPU_MMHUB_0 || - vmhub ==AMDGPU_MMHUB_1 ) && - (!(adev->asic_type ==CHIP_RAVEN && - adev->rev_id <0x8 && - adev->pdev->device ==0x15d8 ))) +if (value)/* * add semaphore release after invalidation, * write with 0 means semaphore release @@ -524,6 +538,7 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,struct amdgpu_vmhub *hub = &adev->vmhub[ring->funcs->vmhub];uint32_t req =gmc_v9_0_get_invalidate_req (vmid,0 );unsigned eng = ring->vm_inv_eng; +bool value =gmc_v9_0_use_invalidate_semaphore (ring->adev, ring->funcs->vmhub);/* * It may lose gpuvm invalidate acknowldege state across power-gating @@ -533,11 +548,7 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,*/ /* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */ -if ((ring->funcs->vmhub ==AMDGPU_MMHUB_0 || - ring->funcs->vmhub ==AMDGPU_MMHUB_1 ) && - (!(adev->asic_type ==CHIP_RAVEN && - adev->rev_id <0x8 && - adev->pdev->device ==0x15d8 ))) +if (value)/* a read return value of 1 means semaphore acuqire */ amdgpu_ring_emit_reg_wait (ring, hub->vm_inv_eng0_sem + eng,0x1 ,0x1 );@@ -553,11 +564,7 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring, req, 1 << vmid);/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */ -if ((ring->funcs->vmhub ==AMDGPU_MMHUB_0 || - ring->funcs->vmhub ==AMDGPU_MMHUB_1 ) && - (!(adev->asic_type ==CHIP_RAVEN && - adev->rev_id <0x8 && - adev->pdev->device ==0x15d8 ))) +if (value)/* * add semaphore release after invalidation, * write with 0 means semaphore release -- 2.17.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Christian König
maintainerAm 10.12.19 um 17:20 schrieb Changfeng.Zhu:
Quoted 29 lines
From: changzhu <[email protected]>
It may fail to load guest driver in round 2 or cause Xstart problem when using invalidate semaphore for SRIOV or picasso. So it needs avoid using invalidate semaphore for SRIOV and picasso.
Change-Id I806f8e99ec97be84e6aed0f5c499a53b1931b490Signed-off-by changzhu <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 47 +++++++++++++++------------ 1 file changed, 27 insertions(+), 20 deletions(-)drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +9
-0@@ -412,6 +412,27 @@ static uint32_t gmc_v9_0_get_invalidate_req(unsigned int vmid,return req; } +/** +* gmc_v9_0_use_invalidate_semaphore - judge whether to use semaphore +* +* @adev: amdgpu_device pointer +* @vmhub: vmhub type +* +*/ +static bool gmc_v9_0_use_invalidate_semaphore (struct amdgpu_device *adev, +uint32_t vmhub)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c static uint32_t gmc_v9_0_get_invalidate_req(unsigned int vmid, · line 433
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +10
-0+{ +if ((vmhub ==AMDGPU_MMHUB_0 || + vmhub ==AMDGPU_MMHUB_1 ) && + (!amdgpu_sriov_vf (adev)) && + (!(adev->asic_type ==CHIP_RAVEN && + adev->rev_id <0x8 && + adev->pdev->device ==0x15d8 ))) +return true; +else +return false;
Probably better to not use an if here but instead just return the value. E.g. something like this:
return (vmhub == AMD..... || ....) &&
....
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, · line 458
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +3
-0+} +/* * GART * VMID 0 is the physical GPU addresses as used by the kernel. @@ -434,6 +455,7 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,const unsigned eng =17 ;u32 j, tmp;struct amdgpu_vmhub *hub; +bool value =gmc_v9_0_use_invalidate_semaphore (adev, vmhub);
Please use a more meaningful name for the variable, something like use_semaphore.
And move that to the beginning of the declaration.
Christian.
Quoted 53 lines
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +4
-15BUG_ON (vmhub >= adev->num_vmhubs);@@ -464,11 +486,7 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,*/ /* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */ -if ((vmhub ==AMDGPU_MMHUB_0 || - vmhub ==AMDGPU_MMHUB_1 ) && - (!(adev->asic_type ==CHIP_RAVEN && - adev->rev_id <0x8 && - adev->pdev->device ==0x15d8 ))) { +if (value) {for (j =0 ; j < adev->usec_timeout; j++) {/* a read return value of 1 means semaphore acuqire */ tmp =RREG32_NO_KIQ (hub->vm_inv_eng0_sem + eng);@@ -498,11 +516,7 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, }/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */ -if ((vmhub ==AMDGPU_MMHUB_0 || - vmhub ==AMDGPU_MMHUB_1 ) && - (!(adev->asic_type ==CHIP_RAVEN && - adev->rev_id <0x8 && - adev->pdev->device ==0x15d8 ))) +if (value)/* * add semaphore release after invalidation, * write with 0 means semaphore release @@ -524,6 +538,7 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,struct amdgpu_vmhub *hub = &adev->vmhub[ring->funcs->vmhub];uint32_t req =gmc_v9_0_get_invalidate_req (vmid,0 );unsigned eng = ring->vm_inv_eng; +bool value =gmc_v9_0_use_invalidate_semaphore (ring->adev, ring->funcs->vmhub);/* * It may lose gpuvm invalidate acknowldege state across power-gating @@ -533,11 +548,7 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,*/ /* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */ -if ((ring->funcs->vmhub ==AMDGPU_MMHUB_0 || - ring->funcs->vmhub ==AMDGPU_MMHUB_1 ) && - (!(adev->asic_type ==CHIP_RAVEN && - adev->rev_id <0x8 && - adev->pdev->device ==0x15d8 ))) +if (value)/* a read return value of 1 means semaphore acuqire */ amdgpu_ring_emit_reg_wait (ring, hub->vm_inv_eng0_sem + eng,0x1 ,0x1 );@@ -553,11 +564,7 @@ static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring, req, 1 << vmid);
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring, · line 570
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +1
-5/* TODO: It needs to continue working on debugging with semaphore for GFXHUB as well. */ -if ((ring->funcs->vmhub ==AMDGPU_MMHUB_0 || - ring->funcs->vmhub ==AMDGPU_MMHUB_1 ) && - (!(adev->asic_type ==CHIP_RAVEN && - adev->rev_id <0x8 && - adev->pdev->device ==0x15d8 ))) +if (value)/* * add semaphore release after invalidation, * write with 0 means semaphore release
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx