On Thu, Nov 3, 2022 at 12:06 AM Victor Zhao <Victor.Zhao@xxxxxxx> wrote:
>
> - clear kiq ring after suspend/resume under sriov to aviod kiq ring
> test failure
> - update irq after resume to fix kiq interrput loss
>
> Signed-off-by: Victor Zhao <Victor.Zhao@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 ++
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 2 ++
> 2 files changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 522820eeaa59..5b9f992e4607 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -4197,6 +4197,8 @@ int amdgpu_device_resume(struct drm_device *dev, bool fbcon)
> }
>
> /* Make sure IB tests flushed */
> + if (amdgpu_sriov_vf(adev))
> + amdgpu_irq_gpu_reset_resume_helper(adev);
> flush_delayed_work(&adev->delayed_init_work);
>
> if (adev->in_s0ix) {
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> index 7853d3ca58cf..49d34c7bbf20 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> @@ -6909,6 +6909,8 @@ static int gfx_v10_0_kiq_init_queue(struct amdgpu_ring *ring)
> mutex_unlock(&adev->srbm_mutex);
> } else {
> memset((void *)mqd, 0, sizeof(*mqd));
> + if (amdgpu_sriov_vf(adev) && adev->in_suspend)
> + amdgpu_ring_clear_ring(ring);
gfx_v8_0.c, gfx_v9_0.c, and gfx_v11_0.c need a similar fix. With
those fixed as well, the patch is:
Acked-by: Alex Deucher <alexander.deucher@xxxxxxx>
Alex
> mutex_lock(&adev->srbm_mutex);
> nv_grbm_select(adev, ring->me, ring->pipe, ring->queue, 0);
> amdgpu_ring_init_mqd(ring);
> --
> 2.25.1
>
