Skip to contentSkip to conversation

drm/amd/powerplay: move the smc_if_version to asic file

PATCH In review Wang, Kevin(Yang) 2 participants 2 messages Mar 11, 2019 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 2 ++
 drivers/gpu/drm/amd/powerplay/smu_v11_0.c      | 4 ++--
 drivers/gpu/drm/amd/powerplay/vega20_ppt.c     | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +2 -0
index 851234e..b0dc5a5 100644
@@ -401,6 +401,8 @@ struct smu_context
 	uint32_t workload_setting[WORKLOAD_POLICY_MAX];
 	uint32_t power_profile_mode;
 	uint32_t default_power_profile_mode;
+
+	uint32_t smc_if_version;
 };
 
 struct pptable_funcs {
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +2 -2
index 4d1bdaa..e92da41 100644
@@ -224,8 +224,8 @@ static int smu_v11_0_check_fw_version(struct smu_context *smu)
 	if (ret)
 		goto err;
 
-	if (smu_version == SMU11_DRIVER_IF_VERSION)
-		return 0;
+	if (smu_version != smu->smc_if_version)
+		ret = -EINVAL;
 err:
 	return ret;
 }
drivers/gpu/drm/amd/powerplay/vega20_ppt.c +1 -0
index 1996f2c..214142c 100644
@@ -2704,4 +2704,5 @@ static const struct pptable_funcs vega20_ppt_funcs = {
 void vega20_set_ppt_funcs(struct smu_context *smu)
 {
 	smu->ppt_funcs = &vega20_ppt_funcs;
+	smu->smc_if_version = SMU11_DRIVER_IF_VERSION;
 }
Signature · 6 lines
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1552273553-28570-1-git-send-email-kevin1.wang-5C7GfCeVMHo@public.gmane.org

Reviewed-by Huang Rui
#2 lore raw
Quoted 8 lines

-----Original Message-----
From: Wang, Kevin(Yang)
Sent: Monday, March 11, 2019 11:06 AM
To: [email protected]
Cc: Huang, Ray <[email protected]>; Wang, Kevin(Yang) <[email protected]>
Subject: [PATCH] drm/amd/powerplay: move the smc_if_version to asic file

Quoted 4 lines

each asic may be has different smc if version, so move its to asic file to implement.

Quoted 48 lines
---
 drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 2 ++
 drivers/gpu/drm/amd/powerplay/smu_v11_0.c      | 4 ++--
 drivers/gpu/drm/amd/powerplay/vega20_ppt.c     | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +2 -0
index 851234e..b0dc5a5 100644
@@ -401,6 +401,8 @@ struct smu_context
 	uint32_t workload_setting[WORKLOAD_POLICY_MAX];
 	uint32_t power_profile_mode;
 	uint32_t default_power_profile_mode;
+
+	uint32_t smc_if_version;
 };
 
 struct pptable_funcs {
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +2 -2
index 4d1bdaa..e92da41 100644
@@ -224,8 +224,8 @@ static int smu_v11_0_check_fw_version(struct
 smu_context *smu)
 	if (ret)
 		goto err;
 
-	if (smu_version == SMU11_DRIVER_IF_VERSION)
-		return 0;
+	if (smu_version != smu->smc_if_version)
+		ret = -EINVAL;
 err:
 	return ret;

}

drivers/gpu/drm/amd/powerplay/vega20_ppt.c +1 -1
index 1996f2c..214142c 100644
@@ -2704,4 +2704,5 @@ static const struct pptable_funcs vega20_ppt_funcs
 = {  void vega20_set_ppt_funcs(struct smu_context *smu)  {
 	smu->ppt_funcs = &vega20_ppt_funcs;
+	smu->smc_if_version = SMU11_DRIVER_IF_VERSION;
 }
--
Quoted 1 line

2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx