drm/amdgpu/pm: Remove unsupported MP1 messages from aldebaran

PrepareMp1Reset and SoftReset messages are not supported on aldebaran.

Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Feifei Xu <Feifei.Xu@amd.com>
Reviewed-by: Kevin Wang <kevin1.wang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index 21492ab4c9ac5141a824cbd5469fa1437bed01af..9f2482870353e678cec303e60a0d820ff1ded202 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -1921,9 +1921,6 @@ int smu_set_mp1_state(void *handle,
                msg = SMU_MSG_PrepareMp1ForUnload;
                break;
        case PP_MP1_STATE_RESET:
-       /*TODO: since the SMU_MSG_PrepareMp1ForReset is retired in Aldebaran
-       * Add handling here forAldebaran.
-       */
                msg = SMU_MSG_PrepareMp1ForReset;
                break;
        case PP_MP1_STATE_NONE:

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
index 2f3c87bf535b97937128ef5fb4aafb02e702e939..b561c1eb4678d0b640005694887f2adbc173ce51 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
@@ -108,9 +108,7 @@ static const struct cmn2asic_msg_mapping aldebaran_message_map[SMU_MSG_MAX_COUNT
        MSG_MAP(SetPptLimit,                         PPSMC_MSG_SetPptLimit,                     0),
        MSG_MAP(GetPptLimit,                         PPSMC_MSG_GetPptLimit,                     1),
        MSG_MAP(PrepareMp1ForUnload,                 PPSMC_MSG_PrepareMp1ForUnload,             0),
-       MSG_MAP(PrepareMp1ForReset,                  PPSMC_MSG_PrepareMp1ForReset,              0),
        MSG_MAP(GfxDriverReset,                      PPSMC_MSG_GfxDriverReset,                  0),
-       MSG_MAP(SoftReset,                           PPSMC_MSG_SoftReset,                       0),
        MSG_MAP(RunDcBtc,                            PPSMC_MSG_RunDcBtc,                        0),
        MSG_MAP(DramLogSetDramAddrHigh,              PPSMC_MSG_DramLogSetDramAddrHigh,          0),
        MSG_MAP(DramLogSetDramAddrLow,               PPSMC_MSG_DramLogSetDramAddrLow,           0),