Commit bdb2b9e1 authored by Yang Wang's avatar Yang Wang Committed by Alex Deucher
Browse files

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: default avatarYang Wang <kevinyang.wang@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarAsad Kamal <asad.kamal@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ab4905d4

drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h

+2 −0
Original line number Diff line number Diff line
@@ -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),            \

drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

	};

drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.c

+2 −2
Original line number Diff line number Diff line
@@ -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),