Commit fe68ceef authored by Xiaojian Du's avatar Xiaojian Du Committed by Alex Deucher
Browse files

Revert "drm/amdgpu: disable gpu reset on Vangogh for now" 



This reverts commit 33cf440d.
And it will enable mode-2 gpu reset for vangogh,
it asks PSP firmware version is 00.1A.00.0F or newer.

Signed-off-by: default avatarXiaojian Du <Xiaojian.Du@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 56b53c0b

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

+1 −0
Original line number Diff line number Diff line
@@ -4254,6 +4254,7 @@ bool amdgpu_device_should_recover_gpu(struct amdgpu_device *adev) 
		case CHIP_SIENNA_CICHLID:

		case CHIP_NAVY_FLOUNDER:

		case CHIP_DIMGREY_CAVEFISH:

		case CHIP_VANGOGH:

			break;

		default:

			goto disabled;

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

+0 −4
Original line number Diff line number Diff line
@@ -561,10 +561,6 @@ static int nv_asic_reset(struct amdgpu_device *adev) 
	int ret = 0;

	struct smu_context *smu = &adev->smu;



	/* skip reset on vangogh for now */

	if (adev->asic_type == CHIP_VANGOGH)

		return 0;



	switch (nv_asic_reset_method(adev)) {

	case AMD_RESET_METHOD_PCI:

		dev_info(adev->dev, "PCI reset\n");