drm/amd/pm: Add mode2 support for SMU v13.0.12

Add mode2 reset support for smu version 13.0.12

Signed-off-by: Asad Kamal <asad.kamal@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
index a0acb65f4b40afbcd9d1a305b4893aa66fadfde7..dabfbdf6f1ce670646803a9b1d284bcf8e46925d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
@@ -183,6 +183,7 @@ int amdgpu_reset_init(struct amdgpu_device *adev)
        switch (amdgpu_ip_version(adev, MP1_HWIP, 0)) {
        case IP_VERSION(13, 0, 2):
        case IP_VERSION(13, 0, 6):
+       case IP_VERSION(13, 0, 12):
        case IP_VERSION(13, 0, 14):
                ret = aldebaran_reset_init(adev);
                break;
@@ -206,6 +207,7 @@ int amdgpu_reset_fini(struct amdgpu_device *adev)
        switch (amdgpu_ip_version(adev, MP1_HWIP, 0)) {
        case IP_VERSION(13, 0, 2):
        case IP_VERSION(13, 0, 6):
+       case IP_VERSION(13, 0, 12):
        case IP_VERSION(13, 0, 14):
                ret = aldebaran_reset_fini(adev);
                break;

diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 68bdd91f0a630143505a2818c7db6cf165c9494d..020530f978142f56b8572a1e9df547aa248ac258 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -556,6 +556,7 @@ soc15_asic_reset_method(struct amdgpu_device *adev)
                break;
        case IP_VERSION(13, 0, 6):
        case IP_VERSION(13, 0, 14):
+       case IP_VERSION(13, 0, 12):
                /* Use gpu_recovery param to target a reset method.
                 * Enable triggering of GPU reset only if specified
                 * by module parameter.