Commit 05347402 authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amdgpu: Add SMU v13.0.6 default reset methods 



For APUs with SMU v13.0.6, mode-2 reset is kept as default and for
others mode-1 is the default reset method.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarAsad Kamal <asad.kamal@amd.com>
Tested-by: default avatarAsad Kamal <asad.kamal@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 39c8b93a

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

+3 −1
Original line number Diff line number Diff line
@@ -559,8 +559,10 @@ soc15_asic_reset_method(struct amdgpu_device *adev) 
		 */

		if (amdgpu_gpu_recovery == 4 || amdgpu_gpu_recovery == 5)

			return AMD_RESET_METHOD_MODE2;

		else if (!(adev->flags & AMD_IS_APU))

			return AMD_RESET_METHOD_MODE1;

		else

			return AMD_RESET_METHOD_NONE;

			return AMD_RESET_METHOD_MODE2;

	default:

		break;

	}

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c

+1 −2
Original line number Diff line number Diff line
@@ -2158,8 +2158,7 @@ static int smu_v13_0_6_mode1_reset(struct smu_context *smu) 


static bool smu_v13_0_6_is_mode1_reset_supported(struct smu_context *smu)

{

	/* TODO: Enable this when FW support is added */

	return false;

	return true;

}



static bool smu_v13_0_6_is_mode2_reset_supported(struct smu_context *smu)