Merge tag 'v5.10-rc1' into asoc-5.10

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_device.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index e8b41756c9f9d38dac6656a9a65862b9346e30d7..37da3537ba2e723247b274eee8699ff9f5e62e04 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -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) {