drm/amd/pm: add dedicated dram addr msg for smu v15

Add dedicated SMU Dram MSG mapping to avoid conflicts
in SMU IP v15 common code for upcoming ASICs.

add new smu msg:
- SMU_MSG_SetDriverDramAddr
- SMU_MSG_SetToolsDramAddr

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

diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
index fc31cc5e97c8b0152aaf39a94f798a9e5a7ab6f0..636ff90923d98d0e8649d280340323621aae1a64 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
+++ b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
@@ -42,8 +42,10 @@
        __SMU_DUMMY_MAP(SetPptLimit),                  \
        __SMU_DUMMY_MAP(SetDriverDramAddrHigh),        \
        __SMU_DUMMY_MAP(SetDriverDramAddrLow),         \
+       __SMU_DUMMY_MAP(SetDriverDramAddr),            \
        __SMU_DUMMY_MAP(SetToolsDramAddrHigh),         \
        __SMU_DUMMY_MAP(SetToolsDramAddrLow),          \
+       __SMU_DUMMY_MAP(SetToolsDramAddr),             \
        __SMU_DUMMY_MAP(TransferTableSmu2Dram),        \
        __SMU_DUMMY_MAP(TransferTableDram2Smu),        \
        __SMU_DUMMY_MAP(UseDefaultPPTable),            \

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c
index eb3fa767c848aae60371c1c7d3a52415c3168553..c3cb3681380642905d53bd1154b3126d0d01371b 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c
@@ -610,7 +610,7 @@ int smu_v15_0_set_driver_table_location(struct smu_context *smu)
 {
        struct smu_table *driver_table = &smu->smu_table.driver_table;
        struct smu_msg_args args = {
-               .msg = SMU_MSG_SetDriverDramAddrHigh,
+               .msg = SMU_MSG_SetDriverDramAddr,
                .num_args = 2,
                .num_out_args = 0,
        };
@@ -625,7 +625,7 @@ int smu_v15_0_set_tool_table_location(struct smu_context *smu)
 {
        struct smu_table *tool_table = &smu->smu_table.tables[SMU_TABLE_PMSTATUSLOG];
        struct smu_msg_args args = {
-               .msg = SMU_MSG_SetToolsDramAddrHigh,
+               .msg = SMU_MSG_SetToolsDramAddr,
                .num_args = 2,
                .num_out_args = 0,
        };

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.c
index 13c2b0cb7ad19a539dd5f9e0714fda338eceb358..cc2babc6a341a5c2092b8048ca2e7e213190e351 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.c
@@ -87,8 +87,8 @@ static const struct cmn2asic_msg_mapping smu_v15_0_8_message_map[SMU_MSG_MAX_COU
        MSG_MAP(GetMetricsVersion,                   PPSMC_MSG_GetMetricsVersion,               1),
        MSG_MAP(GetMetricsTable,                     PPSMC_MSG_GetMetricsTable,                 1),
        MSG_MAP(GetEnabledSmuFeatures,               PPSMC_MSG_GetEnabledSmuFeatures,           1),
-       MSG_MAP(SetDriverDramAddrHigh,               PPSMC_MSG_SetDriverDramAddr,               1),
-       MSG_MAP(SetToolsDramAddrHigh,                PPSMC_MSG_SetToolsDramAddr,                0),
+       MSG_MAP(SetDriverDramAddr,                   PPSMC_MSG_SetDriverDramAddr,               1),
+       MSG_MAP(SetToolsDramAddr,                    PPSMC_MSG_SetToolsDramAddr,                0),
        MSG_MAP(SetSoftMaxByFreq,                    PPSMC_MSG_SetSoftMaxByFreq,                1),
        MSG_MAP(SetPptLimit,                         PPSMC_MSG_SetPptLimit,                     0),
        MSG_MAP(GetPptLimit,                         PPSMC_MSG_GetPptLimit,                     1),