| From 207ac684792560acdb9e06f9d707ebf63c84b0e0 Mon Sep 17 00:00:00 2001 |
| From: Evan Quan <evan.quan@amd.com> |
| Date: Thu, 15 Oct 2020 14:57:46 +0800 |
| Subject: drm/amdgpu: correct the gpu reset handling for job != NULL case |
| |
| From: Evan Quan <evan.quan@amd.com> |
| |
| commit 207ac684792560acdb9e06f9d707ebf63c84b0e0 upstream. |
| |
| 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 |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |
| @@ -4374,7 +4374,7 @@ int amdgpu_device_gpu_recover(struct amd |
| 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) { |