Commit 7d442437 authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: Fix the return for gpu mode1_reset 



amdgpu_device_mode1_reset will return gpu mode1_reset
succeed (ret = 0) as long as wait_for_bootloader call
succeed, regardless of the status reported by smu or
psp firmware. This results to driver continue executing
recovery even smu or psp fail to perform mode1 reset.

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarAsad Kamal <asad.kamal@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a9366b94

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+11 −2
Original line number Diff line number Diff line
@@ -4701,12 +4701,12 @@ int amdgpu_device_mode1_reset(struct amdgpu_device *adev) 
	}



	if (ret)

		dev_err(adev->dev, "GPU mode1 reset failed\n");

		goto mode1_reset_failed;



	amdgpu_device_load_pci_state(adev->pdev);

	ret = amdgpu_psp_wait_for_bootloader(adev);

	if (ret)

		return ret;

		goto mode1_reset_failed;



	/* wait for asic to come out of reset */

	for (i = 0; i < adev->usec_timeout; i++) {
@@ -4717,8 +4717,17 @@ int amdgpu_device_mode1_reset(struct amdgpu_device *adev) 
		udelay(1);

	}



	if (i >= adev->usec_timeout) {

		ret = -ETIMEDOUT;

		goto mode1_reset_failed;

	}



	amdgpu_atombios_scratch_regs_engine_hung(adev, false);



	return 0;



mode1_reset_failed:

	dev_err(adev->dev, "GPU mode1 reset failed\n");

	return ret;

}