drm/amdgpu/gfx10: implement queue reset via MMIO

Using mmio to do queue reset.

v2: Alignment this function with gfx9/gfx9.4.3.

Signed-off-by: Jesse Zhang <jesse.zhang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@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 2ab7c2d51ee97ca313ec8d2be308d81b15da254f..d83d140283c451ae8f11da9d8da0521015897630 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
@@ -3790,12 +3790,46 @@ static void gfx10_kiq_invalidate_tlbs(struct amdgpu_ring *kiq_ring,
        gfx_v10_0_ring_invalidate_tlbs(kiq_ring, pasid, flush_type, all_hub, 1);
 }
 
+static void gfx_v10_0_kiq_reset_hw_queue(struct amdgpu_ring *kiq_ring, uint32_t queue_type,
+                                       uint32_t me_id, uint32_t pipe_id, uint32_t queue_id,
+                                       uint32_t xcc_id, uint32_t vmid)
+{
+       struct amdgpu_device *adev = kiq_ring->adev;
+       unsigned i;
+
+       /* enter save mode */
+       amdgpu_gfx_rlc_enter_safe_mode(adev, xcc_id);
+       mutex_lock(&adev->srbm_mutex);
+       nv_grbm_select(adev, me_id, pipe_id, queue_id, 0);
+
+       if (queue_type == AMDGPU_RING_TYPE_COMPUTE) {
+               WREG32_SOC15(GC, 0, mmCP_HQD_DEQUEUE_REQUEST, 0x2);
+               WREG32_SOC15(GC, 0, mmSPI_COMPUTE_QUEUE_RESET, 0x1);
+               /* wait till dequeue take effects */
+               for (i = 0; i < adev->usec_timeout; i++) {
+                       if (!(RREG32_SOC15(GC, 0, mmCP_HQD_ACTIVE) & 1))
+                               break;
+                       udelay(1);
+               }
+               if (i >= adev->usec_timeout)
+                       dev_err(adev->dev, "fail to wait on hqd deactive\n");
+       } else {
+               dev_err(adev->dev, "reset queue_type(%d) not supported\n", queue_type);
+       }
+
+       nv_grbm_select(adev, 0, 0, 0, 0);
+       mutex_unlock(&adev->srbm_mutex);
+       /* exit safe mode */
+       amdgpu_gfx_rlc_exit_safe_mode(adev, 0);
+}
+
 static const struct kiq_pm4_funcs gfx_v10_0_kiq_pm4_funcs = {
        .kiq_set_resources = gfx10_kiq_set_resources,
        .kiq_map_queues = gfx10_kiq_map_queues,
        .kiq_unmap_queues = gfx10_kiq_unmap_queues,
        .kiq_query_status = gfx10_kiq_query_status,
        .kiq_invalidate_tlbs = gfx10_kiq_invalidate_tlbs,
+       .kiq_reset_hw_queue = gfx_v10_0_kiq_reset_hw_queue,
        .set_resources_size = 8,
        .map_queues_size = 7,
        .unmap_queues_size = 6,