drm/amdgpu: correct the gpu reset handling for job != NULL case
authorEvan Quan <evan.quan@amd.com>
Thu, 15 Oct 2020 06:57:46 +0000 (14:57 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 21 Oct 2020 21:33:43 +0000 (17:33 -0400)
Current code wrongly treat all cases as job == NULL.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-and-tested-by: Jane Jian <Jane.Jian@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

index e8b4175..37da353 100644 (file)
@@ -4625,7 +4625,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
 retry: /* Rest of adevs pre asic reset from XGMI hive. */
        list_for_each_entry(tmp_adev, device_list_handle, gmc.xgmi.head) {
                r = amdgpu_device_pre_asic_reset(tmp_adev,
-                                                NULL,
+                                                (tmp_adev == adev) ? job : NULL,
                                                 &need_full_reset);
                /*TODO Should we stop ?*/
                if (r) {