On Mon, Dec 2, 2019 at 1:11 AM Changfeng.Zhu <changfeng.zhu@xxxxxxx> wrote:
>
> From: changzhu <Changfeng.Zhu@xxxxxxx>
>
> It may cause timeout waiting for sem acquire in VM flush when using
> invalidate semaphore for picasso. So it needs to avoid using invalidate
> semaphore for piasso.
Is this really just picasso? I think it would be simpler to just
disable it for all RAVEN variants.
Alex
>
> Change-Id: I193e6a9eecc0a8b2c99baabf18ad816fb473da52
> Signed-off-by: changzhu <Changfeng.Zhu@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 20 ++++++++++++++++----
> drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 20 ++++++++++++++++----
> 2 files changed, 32 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> index 49b2ce30d629..2f3ba8f143cb 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> @@ -245,7 +245,10 @@ static void gmc_v10_0_flush_vm_hub(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) &&
> - (!amdgpu_sriov_vf(adev))) {
> + (!amdgpu_sriov_vf(adev)) &&
> + (!(adev->asic_type == CHIP_RAVEN &&
> + adev->rev_id < 0x8 &&
> + adev->pdev->device == 0x15d8))) {
> for (i = 0; i < adev->usec_timeout; i++) {
> /* a read return value of 1 means semaphore acuqire */
> tmp = RREG32_NO_KIQ(hub->vm_inv_eng0_sem + eng);
> @@ -280,7 +283,10 @@ static void gmc_v10_0_flush_vm_hub(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) &&
> - (!amdgpu_sriov_vf(adev)))
> + (!amdgpu_sriov_vf(adev)) &&
> + (!(adev->asic_type == CHIP_RAVEN &&
> + adev->rev_id < 0x8 &&
> + adev->pdev->device == 0x15d8)))
> /*
> * add semaphore release after invalidation,
> * write with 0 means semaphore release
> @@ -385,7 +391,10 @@ static uint64_t gmc_v10_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) &&
> - (!amdgpu_sriov_vf(adev)))
> + (!amdgpu_sriov_vf(adev)) &&
> + (!(adev->asic_type == CHIP_RAVEN &&
> + adev->rev_id < 0x8 &&
> + adev->pdev->device == 0x15d8)))
> /* a read return value of 1 means semaphore acuqire */
> amdgpu_ring_emit_reg_wait(ring,
> hub->vm_inv_eng0_sem + eng, 0x1, 0x1);
> @@ -403,7 +412,10 @@ static uint64_t gmc_v10_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) &&
> - (!amdgpu_sriov_vf(adev)))
> + (!amdgpu_sriov_vf(adev)) &&
> + (!(adev->asic_type == CHIP_RAVEN &&
> + adev->rev_id < 0x8 &&
> + adev->pdev->device == 0x15d8)))
> /*
> * add semaphore release after invalidation,
> * write with 0 means semaphore release
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> index 6c9a9c09cdb1..1cfed8787031 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> @@ -466,7 +466,10 @@ 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) &&
> - (!amdgpu_sriov_vf(adev))) {
> + (!amdgpu_sriov_vf(adev)) &&
> + (!(adev->asic_type == CHIP_RAVEN &&
> + adev->rev_id < 0x8 &&
> + adev->pdev->device == 0x15d8))) {
> 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,7 +501,10 @@ 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) &&
> - (!amdgpu_sriov_vf(adev)))
> + (!amdgpu_sriov_vf(adev)) &&
> + (!(adev->asic_type == CHIP_RAVEN &&
> + adev->rev_id < 0x8 &&
> + adev->pdev->device == 0x15d8)))
> /*
> * add semaphore release after invalidation,
> * write with 0 means semaphore release
> @@ -531,7 +537,10 @@ 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) &&
> - (!amdgpu_sriov_vf(adev)))
> + (!amdgpu_sriov_vf(adev)) &&
> + (!(adev->asic_type == CHIP_RAVEN &&
> + adev->rev_id < 0x8 &&
> + adev->pdev->device == 0x15d8)))
> /* a read return value of 1 means semaphore acuqire */
> amdgpu_ring_emit_reg_wait(ring,
> hub->vm_inv_eng0_sem + eng, 0x1, 0x1);
> @@ -549,7 +558,10 @@ 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) &&
> - (!amdgpu_sriov_vf(adev)))
> + (!amdgpu_sriov_vf(adev)) &&
> + (!(adev->asic_type == CHIP_RAVEN &&
> + adev->rev_id < 0x8 &&
> + adev->pdev->device == 0x15d8)))
> /*
> * add semaphore release after invalidation,
> * write with 0 means semaphore release
> --
> 2.17.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
