drm/amd/powerplay: set VCN1 pg only for sienna_cichlid
authorJiansong Chen <Jiansong.Chen@amd.com>
Tue, 7 Jul 2020 08:54:06 +0000 (16:54 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 15 Jul 2020 17:27:34 +0000 (13:27 -0400)
navy_flounder has one VCN instance, and the work around
is to avoid smu reponse error when setting VCN1 pg for
the chip. It is preferred VCN0 and VCN1 are separated
for the pg setting so better power efficiency can be
achieved.

Signed-off-by: Jiansong Chen <Jiansong.Chen@amd.com>
Reviewed-by: Kenneth Feng <kenneth.feng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c

index 468ceed..5faef41 100644 (file)
@@ -826,6 +826,8 @@ static int sienna_cichlid_dpm_set_vcn_enable(struct smu_context *smu, bool enabl
 {
        struct smu_power_context *smu_power = &smu->smu_power;
        struct smu_power_gate *power_gate = &smu_power->power_gate;
+       struct amdgpu_device *adev = smu->adev;
+
        int ret = 0;
 
        if (enable) {
@@ -834,9 +836,12 @@ static int sienna_cichlid_dpm_set_vcn_enable(struct smu_context *smu, bool enabl
                        ret = smu_send_smc_msg_with_param(smu, SMU_MSG_PowerUpVcn, 0, NULL);
                        if (ret)
                                return ret;
-                       ret = smu_send_smc_msg_with_param(smu, SMU_MSG_PowerUpVcn, 0x10000, NULL);
-                       if (ret)
-                               return ret;
+                       if (adev->asic_type == CHIP_SIENNA_CICHLID) {
+                               ret = smu_send_smc_msg_with_param(smu, SMU_MSG_PowerUpVcn,
+                                                                 0x10000, NULL);
+                               if (ret)
+                                       return ret;
+                       }
                }
                power_gate->vcn_gated = false;
        } else {
@@ -844,9 +849,12 @@ static int sienna_cichlid_dpm_set_vcn_enable(struct smu_context *smu, bool enabl
                        ret = smu_send_smc_msg_with_param(smu, SMU_MSG_PowerDownVcn, 0, NULL);
                        if (ret)
                                return ret;
-                       ret = smu_send_smc_msg_with_param(smu, SMU_MSG_PowerDownVcn, 0x10000, NULL);
-                       if (ret)
-                               return ret;
+                       if (adev->asic_type == CHIP_SIENNA_CICHLID) {
+                               ret = smu_send_smc_msg_with_param(smu, SMU_MSG_PowerDownVcn,
+                                                                 0x10000, NULL);
+                               if (ret)
+                                       return ret;
+                       }
                }
                power_gate->vcn_gated = true;
        }