Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/amd/pm: make smu_set_temp_funcs() smu specific for smu v13.0.6
move smu_set_temp_funcs() into smu_v13.0.6 ppt.c file to keep same code
layer in amdgpu_smu.c. (only set_ppt func in amdgpu_smu.c)
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>
authored by
Yang Wang
and committed by
Alex Deucher
4ba48fc3
a3ac30ff
+7
-7
-1
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
-1
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+7
-5
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
+7
-5
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
···
3839
3839
.parse_error_code = aca_smu_parse_error_code,
3840
3840
};
3841
3841
3842
+
static void smu_v13_0_6_set_temp_funcs(struct smu_context *smu)
3843
+
{
3844
+
smu->smu_temp.temp_funcs = (amdgpu_ip_version(smu->adev, MP1_HWIP, 0)
3845
+
== IP_VERSION(13, 0, 12)) ? &smu_v13_0_12_temp_funcs : NULL;
3846
+
}
3847
+
3842
3848
static const struct pptable_funcs smu_v13_0_6_ppt_funcs = {
3843
3849
/* init dpm */
3844
3850
.get_allowed_feature_mask = smu_v13_0_6_get_allowed_feature_mask,
···
3919
3913
smu->smc_driver_if_version = SMU13_0_6_DRIVER_IF_VERSION;
3920
3914
smu->smc_fw_caps |= SMU_FW_CAP_RAS_PRI;
3921
3915
smu_v13_0_set_smu_mailbox_registers(smu);
3916
+
smu_v13_0_6_set_temp_funcs(smu);
3922
3917
amdgpu_mca_smu_init_funcs(smu->adev, &smu_v13_0_6_mca_smu_funcs);
3923
3918
amdgpu_aca_set_smu_funcs(smu->adev, &smu_v13_0_6_aca_smu_funcs);
3924
3919
}
3925
3920
3926
-
void smu_v13_0_6_set_temp_funcs(struct smu_context *smu)
3927
-
{
3928
-
smu->smu_temp.temp_funcs = (amdgpu_ip_version(smu->adev, MP1_HWIP, 0)
3929
-
== IP_VERSION(13, 0, 12)) ? &smu_v13_0_12_temp_funcs : NULL;
3930
-
}
-1
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.h
-1
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.h
···
74
74
};
75
75
76
76
extern void smu_v13_0_6_set_ppt_funcs(struct smu_context *smu);
77
-
extern void smu_v13_0_6_set_temp_funcs(struct smu_context *smu);
78
77
bool smu_v13_0_6_cap_supported(struct smu_context *smu, enum smu_v13_0_6_caps cap);
79
78
int smu_v13_0_6_get_static_metrics_table(struct smu_context *smu);
80
79
int smu_v13_0_6_get_metrics_table(struct smu_context *smu, void *metrics_table,