leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amdgpu/soc21: add mode2 asic reset for SMU IP v13.0.4

Browse Source 
Set the default reset method to mode2 for SMU IP v13.0.4

Acked-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Tim Huang <Tim.Huang@amd.com>
Signed-off-by: Tim Huang <tim.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher
2022-05-11 17:31:27 -04:00
parent 136f614931
commit ea64228d26
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/amd/amdgpu/soc21.c
View File

@@ -310,6 +310,7 @@ static enum amd_reset_method
soc21_asic_reset_method(struct amdgpu_device *adev) soc21_asic_reset_method(struct amdgpu_device *adev)
{ {
if (amdgpu_reset_method == AMD_RESET_METHOD_MODE1 || if (amdgpu_reset_method == AMD_RESET_METHOD_MODE1 ||
amdgpu_reset_method == AMD_RESET_METHOD_MODE2 ||
amdgpu_reset_method == AMD_RESET_METHOD_BACO) amdgpu_reset_method == AMD_RESET_METHOD_BACO)
return amdgpu_reset_method; return amdgpu_reset_method;
@@ -320,6 +321,8 @@ soc21_asic_reset_method(struct amdgpu_device *adev)
switch (adev->ip_versions[MP1_HWIP][0]) { switch (adev->ip_versions[MP1_HWIP][0]) {
case IP_VERSION(13, 0, 0): case IP_VERSION(13, 0, 0):
return AMD_RESET_METHOD_MODE1; return AMD_RESET_METHOD_MODE1;
case IP_VERSION(13, 0, 4):
return AMD_RESET_METHOD_MODE2;
default: default:
if (amdgpu_dpm_is_baco_supported(adev)) if (amdgpu_dpm_is_baco_supported(adev))
return AMD_RESET_METHOD_BACO; return AMD_RESET_METHOD_BACO;
@@ -341,6 +344,10 @@ static int soc21_asic_reset(struct amdgpu_device *adev)
dev_info(adev->dev, "BACO reset\n"); dev_info(adev->dev, "BACO reset\n");
ret = amdgpu_dpm_baco_reset(adev); ret = amdgpu_dpm_baco_reset(adev);
break; break;
case AMD_RESET_METHOD_MODE2:
dev_info(adev->dev, "MODE2 reset\n");
ret = amdgpu_dpm_mode2_reset(adev);
break;
default: default:
dev_info(adev->dev, "MODE1 reset\n"); dev_info(adev->dev, "MODE1 reset\n");
ret = amdgpu_device_mode1_reset(adev); ret = amdgpu_device_mode1_reset(adev);