drm/amdgpu/gfx10: fix resume failure when enabling async gfx ring

'adev->in_suspend' code path is missing in gfx_v10_0_gfx_init_queue()

Signed-off-by: Xiaojie Yuan <xiaojie.yuan@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
index 2f2e5e5ce56ba618eaca3c4cc90df917dbacc143..274d9087879a4678eabf3100ea8ea3ccbe75d991 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
@@ -2880,7 +2880,19 @@ static int gfx_v10_0_gfx_init_queue(struct amdgpu_ring *ring)
        struct amdgpu_device *adev = ring->adev;
        struct v10_gfx_mqd *mqd = ring->mqd_ptr;
 
-       if (adev->in_gpu_reset) {
+       if (!adev->in_gpu_reset && !adev->in_suspend) {
+               memset((void *)mqd, 0, sizeof(*mqd));
+               mutex_lock(&adev->srbm_mutex);
+               nv_grbm_select(adev, ring->me, ring->pipe, ring->queue, 0);
+               gfx_v10_0_gfx_mqd_init(ring);
+#ifdef BRING_UP_DEBUG
+               gfx_v10_0_gfx_queue_init_register(ring);
+#endif
+               nv_grbm_select(adev, 0, 0, 0, 0);
+               mutex_unlock(&adev->srbm_mutex);
+               if (adev->gfx.me.mqd_backup[AMDGPU_MAX_GFX_RINGS])
+                       memcpy(adev->gfx.me.mqd_backup[AMDGPU_MAX_GFX_RINGS], mqd, sizeof(*mqd));
+       } else if (adev->in_gpu_reset) {
                /* reset mqd with the backup copy */
                if (adev->gfx.me.mqd_backup[AMDGPU_MAX_GFX_RINGS])
                        memcpy(mqd, adev->gfx.me.mqd_backup[AMDGPU_MAX_GFX_RINGS], sizeof(*mqd));
@@ -2895,17 +2907,7 @@ static int gfx_v10_0_gfx_init_queue(struct amdgpu_ring *ring)
                mutex_unlock(&adev->srbm_mutex);
 #endif
        } else {
-               memset((void *)mqd, 0, sizeof(*mqd));
-               mutex_lock(&adev->srbm_mutex);
-               nv_grbm_select(adev, ring->me, ring->pipe, ring->queue, 0);
-               gfx_v10_0_gfx_mqd_init(ring);
-#ifdef BRING_UP_DEBUG
-               gfx_v10_0_gfx_queue_init_register(ring);
-#endif
-               nv_grbm_select(adev, 0, 0, 0, 0);
-               mutex_unlock(&adev->srbm_mutex);
-               if (adev->gfx.me.mqd_backup[AMDGPU_MAX_GFX_RINGS])
-                       memcpy(adev->gfx.me.mqd_backup[AMDGPU_MAX_GFX_RINGS], mqd, sizeof(*mqd));
+               amdgpu_ring_clear_ring(ring);
        }
 
        return 0;