aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Wang <kevin1.wang@amd.com>2019-03-10 23:00:48 -0400
committerAlex Deucher <alexander.deucher@amd.com>2019-03-19 16:36:50 -0400
commit1fb4f15548240df4f4bd9a855ee09942d6accc74 (patch)
tree4456985f1327eb74c2c8b407656ae3cb3e1a4003
parent96e1b2c2f2639a83baaa61fed6ceccd76b99fa8b (diff)
drm/amd/powerplay: move the smc_if_version to asic file
each asic may be has different smc if version, so move its to asic file to implement. Signed-off-by: Kevin Wang <kevin1.wang@amd.com> Reviewed-by: Huang Rui <ray.huang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h2
-rw-r--r--drivers/gpu/drm/amd/powerplay/smu_v11_0.c4
-rw-r--r--drivers/gpu/drm/amd/powerplay/vega20_ppt.c1
3 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
index 6a4e9f242aaf..2083139533e9 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
@@ -401,6 +401,8 @@ struct smu_context
401 uint32_t workload_setting[WORKLOAD_POLICY_MAX]; 401 uint32_t workload_setting[WORKLOAD_POLICY_MAX];
402 uint32_t power_profile_mode; 402 uint32_t power_profile_mode;
403 uint32_t default_power_profile_mode; 403 uint32_t default_power_profile_mode;
404
405 uint32_t smc_if_version;
404}; 406};
405 407
406struct pptable_funcs { 408struct pptable_funcs {
diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
index f90410435e4c..17143888e37e 100644
--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
+++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
@@ -234,8 +234,8 @@ static int smu_v11_0_check_fw_version(struct smu_context *smu)
234 if (ret) 234 if (ret)
235 goto err; 235 goto err;
236 236
237 if (smu_version == SMU11_DRIVER_IF_VERSION) 237 if (smu_version != smu->smc_if_version)
238 return 0; 238 ret = -EINVAL;
239err: 239err:
240 return ret; 240 return ret;
241} 241}
diff --git a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c
index c2135baf7976..7e9e8ad9a300 100644
--- a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c
@@ -2408,4 +2408,5 @@ static const struct pptable_funcs vega20_ppt_funcs = {
2408void vega20_set_ppt_funcs(struct smu_context *smu) 2408void vega20_set_ppt_funcs(struct smu_context *smu)
2409{ 2409{
2410 smu->ppt_funcs = &vega20_ppt_funcs; 2410 smu->ppt_funcs = &vega20_ppt_funcs;
2411 smu->smc_if_version = SMU11_DRIVER_IF_VERSION;
2411} 2412}