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

[Nirmoy]

Acked-by: Nirmoy Das <nirmoy.das at amd.com> for both patches.

On 8/11/20 6:04 PM, Alex Deucher wrote:
> 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.
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/cik.c   | 2 ++
>   drivers/gpu/drm/amd/amdgpu/nv.c    | 6 ++++--
>   drivers/gpu/drm/amd/amdgpu/si.c    | 2 ++
>   drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +++
>   drivers/gpu/drm/amd/amdgpu/vi.c    | 2 ++
>   5 files changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
> index c2c67ab68a43..7e71ffbca93d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/cik.c
> +++ b/drivers/gpu/drm/amd/amdgpu/cik.c
> @@ -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);
>   	}
>   
> diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
> index da8024c2826e..54e941e0db60 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/nv.c
> @@ -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;
>   }
> diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c
> index e330884edd19..eaa2f071b139 100644
> --- a/drivers/gpu/drm/amd/amdgpu/si.c
> +++ b/drivers/gpu/drm/amd/amdgpu/si.c
> @@ -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);
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
> index 84d811b6e48b..3cd98c144bc6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> @@ -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);
>   	}
>   }
> diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
> index f6f2ed0830b1..f03314300ae3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vi.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vi.c
> @@ -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);
>   	}
>