Commit 11043b7a authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: note what type of reset we are using 



When we reset the GPU, note what type of reset will be
used.  This makes debugging different reset scenarios
more clear as the driver may use different reset
methods depending on conditions on the system.

Acked-by: default avatarNirmoy Das <nirmoy.das@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bddbacc9

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

+2 −0
Original line number Diff line number Diff line
@@ -1366,8 +1366,10 @@ static int cik_asic_reset(struct amdgpu_device *adev) 
	int r;



	if (cik_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) {

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

		r = amdgpu_dpm_baco_reset(adev);

	} else {

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

		r = cik_asic_pci_config_reset(adev);

	}

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

+4 −2
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ static int nv_asic_reset(struct amdgpu_device *adev) 
	struct smu_context *smu = &adev->smu;



	if (nv_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) {

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

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



		ret = smu_baco_enter(smu);

		if (ret)
@@ -387,8 +387,10 @@ static int nv_asic_reset(struct amdgpu_device *adev) 
		ret = smu_baco_exit(smu);

		if (ret)

			return ret;

	} else

	} else {

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

		ret = nv_asic_mode1_reset(adev);

	}



	return ret;

}

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

+2 −0
Original line number Diff line number Diff line
@@ -1302,6 +1302,8 @@ static int si_asic_reset(struct amdgpu_device *adev) 
{

	int r;



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



	amdgpu_atombios_scratch_regs_engine_hung(adev, true);



	r = si_gpu_pci_config_reset(adev);

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

+3 −0
Original line number Diff line number Diff line
@@ -580,10 +580,13 @@ static int soc15_asic_reset(struct amdgpu_device *adev) 


	switch (soc15_asic_reset_method(adev)) {

		case AMD_RESET_METHOD_BACO:

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

			return soc15_asic_baco_reset(adev);

		case AMD_RESET_METHOD_MODE2:

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

			return amdgpu_dpm_mode2_reset(adev);

		default:

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

			return soc15_asic_mode1_reset(adev);

	}

}

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

+2 −0
Original line number Diff line number Diff line
@@ -752,8 +752,10 @@ static int vi_asic_reset(struct amdgpu_device *adev) 
	int r;



	if (vi_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) {

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

		r = amdgpu_dpm_baco_reset(adev);

	} else {

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

		r = vi_asic_pci_config_reset(adev);

	}