drm/amdgpu: Init the cp MQD if it's not be initialized before

The MQD might not be initialized duirng first init period if the device need to be reset
druing probe. Driver need to proper init them in gpu recovery period

Signed-off-by: shaoyunl <shaoyun.liu@amd.com>
Acked-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_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 652f71824a74ecab97494043bbb52ec862561e0f..a6365110fad8f4ddc91246a428ae8f035695a8ee 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -3750,11 +3750,18 @@ static int gfx_v9_0_kiq_init_queue(struct amdgpu_ring *ring)
        struct amdgpu_device *adev = ring->adev;
        struct v9_mqd *mqd = ring->mqd_ptr;
        int mqd_idx = AMDGPU_MAX_COMPUTE_RINGS;
+       struct v9_mqd *tmp_mqd;
 
        gfx_v9_0_kiq_setting(ring);
 
-       if (amdgpu_in_reset(adev)) { /* for GPU_RESET case */
-               /* reset MQD to a clean status */
+       /* GPU could be in bad state during probe, driver trigger the reset
+        * after load the SMU, in this case , the mqd is not be initialized.
+        * driver need to re-init the mqd.
+        * check mqd->cp_hqd_pq_control since this value should not be 0
+        */
+       tmp_mqd = (struct v9_mqd *)adev->gfx.mec.mqd_backup[mqd_idx];
+       if (amdgpu_in_reset(adev) && tmp_mqd->cp_hqd_pq_control){
+               /* for GPU_RESET case , reset MQD to a clean status */
                if (adev->gfx.mec.mqd_backup[mqd_idx])
                        memcpy(mqd, adev->gfx.mec.mqd_backup[mqd_idx], sizeof(struct v9_mqd_allocation));
 
@@ -3790,8 +3797,15 @@ static int gfx_v9_0_kcq_init_queue(struct amdgpu_ring *ring)
        struct amdgpu_device *adev = ring->adev;
        struct v9_mqd *mqd = ring->mqd_ptr;
        int mqd_idx = ring - &adev->gfx.compute_ring[0];
+       struct v9_mqd *tmp_mqd;
 
-       if (!amdgpu_in_reset(adev) && !adev->in_suspend) {
+       /* Same as above kiq init, driver need to re-init the mqd if mqd->cp_hqd_pq_control
+        * is not be initialized before
+        */
+       tmp_mqd = (struct v9_mqd *)adev->gfx.mec.mqd_backup[mqd_idx];
+
+       if (!tmp_mqd->cp_hqd_pq_control ||
+           (!amdgpu_in_reset(adev) && !adev->in_suspend)) {
                memset((void *)mqd, 0, sizeof(struct v9_mqd_allocation));
                ((struct v9_mqd_allocation *)mqd)->dynamic_cu_mask = 0xFFFFFFFF;
                ((struct v9_mqd_allocation *)mqd)->dynamic_rb_mask = 0xFFFFFFFF;